Skip to content

Commit d53ef69

Browse files
jcs090218jcs090218
committed
Removed ide manager.
1 parent edafc7a commit d53ef69

File tree

18 files changed

+683
-452
lines changed

18 files changed

+683
-452
lines changed

‎Assets/JCSUnity/Scenes/Demo/GUI/JCS_LiquidBarDemo.unity‎

Lines changed: 85 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -533,47 +533,6 @@ Transform:
533533
m_Father: {fileID: 0}
534534
m_RootOrder: 9
535535
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
536-
--- !u!1001 &568035004
537-
PrefabInstance:
538-
m_ObjectHideFlags: 0
539-
serializedVersion: 2
540-
m_Modification:
541-
m_TransformParent: {fileID: 0}
542-
m_Modifications:
543-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
544-
propertyPath: m_LocalPosition.x
545-
value: 0
546-
objectReference: {fileID: 0}
547-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
548-
propertyPath: m_LocalPosition.y
549-
value: 0
550-
objectReference: {fileID: 0}
551-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
552-
propertyPath: m_LocalPosition.z
553-
value: 0
554-
objectReference: {fileID: 0}
555-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
556-
propertyPath: m_LocalRotation.x
557-
value: 0
558-
objectReference: {fileID: 0}
559-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
560-
propertyPath: m_LocalRotation.y
561-
value: 0
562-
objectReference: {fileID: 0}
563-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
564-
propertyPath: m_LocalRotation.z
565-
value: 0
566-
objectReference: {fileID: 0}
567-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
568-
propertyPath: m_LocalRotation.w
569-
value: 1
570-
objectReference: {fileID: 0}
571-
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
572-
propertyPath: m_RootOrder
573-
value: 2
574-
objectReference: {fileID: 0}
575-
m_RemovedComponents: []
576-
m_SourcePrefab: {fileID: 100100000, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
577536
--- !u!1 &745492311
578537
GameObject:
579538
m_ObjectHideFlags: 0
@@ -966,6 +925,10 @@ PrefabInstance:
966925
m_Modification:
967926
m_TransformParent: {fileID: 0}
968927
m_Modifications:
928+
- target: {fileID: 135910, guid: cea3ae018e023684283757410f3065f4, type: 3}
929+
propertyPath: m_Name
930+
value: JCS_Managers
931+
objectReference: {fileID: 0}
969932
- target: {fileID: 442828, guid: cea3ae018e023684283757410f3065f4, type: 3}
970933
propertyPath: m_LocalPosition.x
971934
value: 0
@@ -998,6 +961,18 @@ PrefabInstance:
998961
propertyPath: m_RootOrder
999962
value: 1
1000963
objectReference: {fileID: 0}
964+
- target: {fileID: 442828, guid: cea3ae018e023684283757410f3065f4, type: 3}
965+
propertyPath: m_LocalEulerAnglesHint.x
966+
value: 0
967+
objectReference: {fileID: 0}
968+
- target: {fileID: 442828, guid: cea3ae018e023684283757410f3065f4, type: 3}
969+
propertyPath: m_LocalEulerAnglesHint.y
970+
value: 0
971+
objectReference: {fileID: 0}
972+
- target: {fileID: 442828, guid: cea3ae018e023684283757410f3065f4, type: 3}
973+
propertyPath: m_LocalEulerAnglesHint.z
974+
value: 0
975+
objectReference: {fileID: 0}
1001976
m_RemovedComponents: []
1002977
m_SourcePrefab: {fileID: 100100000, guid: cea3ae018e023684283757410f3065f4, type: 3}
1003978
--- !u!1 &1076938472
@@ -1676,6 +1651,75 @@ RectTransform:
16761651
m_AnchoredPosition: {x: 0, y: 0}
16771652
m_SizeDelta: {x: 0, y: 0}
16781653
m_Pivot: {x: 0, y: 0}
1654+
--- !u!1001 &5090550958760887249
1655+
PrefabInstance:
1656+
m_ObjectHideFlags: 0
1657+
serializedVersion: 2
1658+
m_Modification:
1659+
m_TransformParent: {fileID: 0}
1660+
m_Modifications:
1661+
- target: {fileID: 5090550957556680186, guid: f3f4b7d5553961e4cb7509494c81b400,
1662+
type: 3}
1663+
propertyPath: m_Name
1664+
value: JCS_Settings
1665+
objectReference: {fileID: 0}
1666+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1667+
type: 3}
1668+
propertyPath: m_LocalPosition.x
1669+
value: 0
1670+
objectReference: {fileID: 0}
1671+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1672+
type: 3}
1673+
propertyPath: m_LocalPosition.y
1674+
value: 0
1675+
objectReference: {fileID: 0}
1676+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1677+
type: 3}
1678+
propertyPath: m_LocalPosition.z
1679+
value: 0
1680+
objectReference: {fileID: 0}
1681+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1682+
type: 3}
1683+
propertyPath: m_LocalRotation.x
1684+
value: 0
1685+
objectReference: {fileID: 0}
1686+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1687+
type: 3}
1688+
propertyPath: m_LocalRotation.y
1689+
value: 0
1690+
objectReference: {fileID: 0}
1691+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1692+
type: 3}
1693+
propertyPath: m_LocalRotation.z
1694+
value: 0
1695+
objectReference: {fileID: 0}
1696+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1697+
type: 3}
1698+
propertyPath: m_LocalRotation.w
1699+
value: 1
1700+
objectReference: {fileID: 0}
1701+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1702+
type: 3}
1703+
propertyPath: m_RootOrder
1704+
value: 2
1705+
objectReference: {fileID: 0}
1706+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1707+
type: 3}
1708+
propertyPath: m_LocalEulerAnglesHint.x
1709+
value: 0
1710+
objectReference: {fileID: 0}
1711+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1712+
type: 3}
1713+
propertyPath: m_LocalEulerAnglesHint.y
1714+
value: 0
1715+
objectReference: {fileID: 0}
1716+
- target: {fileID: 5090550959267644780, guid: f3f4b7d5553961e4cb7509494c81b400,
1717+
type: 3}
1718+
propertyPath: m_LocalEulerAnglesHint.z
1719+
value: 0
1720+
objectReference: {fileID: 0}
1721+
m_RemovedComponents: []
1722+
m_SourcePrefab: {fileID: 100100000, guid: f3f4b7d5553961e4cb7509494c81b400, type: 3}
16791723
--- !u!1001 &8910336158534148059
16801724
PrefabInstance:
16811725
m_ObjectHideFlags: 0

‎Assets/JCSUnity/Scripts/GameObject/2D/2DClimbableObject/JCS_2DClimbableObject.cs‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,24 @@ public abstract class JCS_2DClimbableObject
3030
*/
3131
private JCS_OrderLayerObject mOrderLayerObject = null;
3232

33-
private JCS_ClimbableManager mClimbableManager = null;
34-
35-
36-
[Header("** Initilaize Variable (JCS_OrderLayerObject) **")]
33+
[Header("** Initilaize Variable (JCS_2DClimbableObject) **")]
3734

3835
[Tooltip("Ground/Platform the ladder lean on.")]
3936
[SerializeField]
4037
protected JCS_2DPositionPlatform mPositionPlatform = null;
4138

42-
4339
/* Setter & Getter */
4440

4541
public JCS_OrderLayerObject OrderLayerObject { get { return this.mOrderLayerObject; } }
46-
public JCS_ClimbableManager ClimbableManager { get { return this.mClimbableManager; } }
4742
public JCS_2DPositionPlatform PositionPlatform { get { return this.mPositionPlatform; } }
4843

49-
5044
/* Functions */
5145

5246
protected virtual void Awake()
5347
{
5448
this.mOrderLayerObject = this.GetComponent<JCS_OrderLayerObject>();
5549
}
5650

57-
protected virtual void Start()
58-
{
59-
if (ClimbableManager == null)
60-
{
61-
/**
62-
* if climbable object found in the scene, we must have
63-
* the manager to manage.
64-
*/
65-
if (JCS_ClimbableManager.instance == null)
66-
JCS_ClimbableManager.instance = JCS_IndieManager.instance.gameObject.AddComponent<JCS_ClimbableManager>();
67-
68-
this.mClimbableManager = JCS_ClimbableManager.instance;
69-
}
70-
}
71-
7251
/// <summary>
7352
/// Something that needed to check in update can be design here.
7453
/// This function should get call by when the player is done climbing.

‎Assets/JCSUnity/Scripts/GameObject/2D/2DClimbableObject/JCS_2DLadder.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ protected virtual void OnTriggerEnter(Collider other)
5353
if (player == null)
5454
return;
5555

56+
JCS_ClimbableManager cm = JCS_ClimbableManager.instance;
57+
5658
AddSafe(player);
5759

5860
bool isTopOfBox = JCS_Physics.TopOfBox(
@@ -62,13 +64,13 @@ protected virtual void OnTriggerEnter(Collider other)
6264
if (isTopOfBox)
6365
{
6466
// show character behind the ladder
65-
int backOrderLayer = OrderLayerObject.sortingOrder - ClimbableManager.SORTING_ORDER_BEHIND_OFFSET;
67+
int backOrderLayer = OrderLayerObject.sortingOrder - cm.SORTING_ORDER_BEHIND_OFFSET;
6668
SetPlayerSortingOrder(player, backOrderLayer);
6769
}
6870
else
6971
{
7072
// show character infront
71-
int frontOrderLayer = OrderLayerObject.sortingOrder + ClimbableManager.SORTING_ORDER_INFRONT_OFFSET;
73+
int frontOrderLayer = OrderLayerObject.sortingOrder + cm.SORTING_ORDER_INFRONT_OFFSET;
7274
SetPlayerSortingOrder(player, frontOrderLayer);
7375
}
7476

@@ -96,6 +98,8 @@ protected virtual void OnTriggerExit(Collider other)
9698
/// </summary>
9799
public override void ClimbableUpdate()
98100
{
101+
JCS_ClimbableManager cm = JCS_ClimbableManager.instance;
102+
99103
foreach (JCS_2DSideScrollerPlayer player in mSSPlayers)
100104
{
101105
if (player.isGrounded())
@@ -110,7 +114,7 @@ public override void ClimbableUpdate()
110114
if (player.CharacterState == JCS_2DCharacterState.CLIMBING)
111115
{
112116
// show character infront
113-
int frontOrderLayer = OrderLayerObject.sortingOrder + ClimbableManager.SORTING_ORDER_INFRONT_OFFSET;
117+
int frontOrderLayer = OrderLayerObject.sortingOrder + cm.SORTING_ORDER_INFRONT_OFFSET;
114118
SetPlayerSortingOrder(player, frontOrderLayer);
115119

116120

@@ -128,7 +132,7 @@ public override void ClimbableUpdate()
128132
player.JustClimbOnTopOfBox = true;
129133

130134
// show character behind the ladder
131-
int backOrderLayer = OrderLayerObject.sortingOrder - ClimbableManager.SORTING_ORDER_BEHIND_OFFSET;
135+
int backOrderLayer = OrderLayerObject.sortingOrder - cm.SORTING_ORDER_BEHIND_OFFSET;
132136
SetPlayerSortingOrder(player, backOrderLayer);
133137
}
134138
}

‎Assets/JCSUnity/Scripts/GameObject/2D/2DClimbableObject/JCS_2DRope.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ protected virtual void OnTriggerEnter(Collider other)
5353
if (player == null)
5454
return;
5555

56+
JCS_ClimbableManager cm = JCS_ClimbableManager.instance;
57+
5658
AddSafe(player);
5759

5860
bool isTopOfBox = JCS_Physics.TopOfBox(
@@ -62,13 +64,13 @@ protected virtual void OnTriggerEnter(Collider other)
6264
if (isTopOfBox)
6365
{
6466
// show character behind the ladder
65-
int backOrderLayer = OrderLayerObject.sortingOrder - ClimbableManager.SORTING_ORDER_BEHIND_OFFSET;
67+
int backOrderLayer = OrderLayerObject.sortingOrder - cm.SORTING_ORDER_BEHIND_OFFSET;
6668
SetPlayerSortingOrder(player, backOrderLayer);
6769
}
6870
else
6971
{
7072
// show character infront
71-
int frontOrderLayer = OrderLayerObject.sortingOrder + ClimbableManager.SORTING_ORDER_INFRONT_OFFSET;
73+
int frontOrderLayer = OrderLayerObject.sortingOrder + cm.SORTING_ORDER_INFRONT_OFFSET;
7274
SetPlayerSortingOrder(player, frontOrderLayer);
7375
}
7476

@@ -96,6 +98,8 @@ protected virtual void OnTriggerExit(Collider other)
9698
/// </summary>
9799
public override void ClimbableUpdate()
98100
{
101+
JCS_ClimbableManager cm = JCS_ClimbableManager.instance;
102+
99103
foreach (JCS_2DSideScrollerPlayer player in mSSPlayers)
100104
{
101105
if (player.isGrounded())
@@ -111,7 +115,7 @@ public override void ClimbableUpdate()
111115
player.ClimbMoveType == JCS_ClimbMoveType.MOVE_UP)
112116
{
113117
// show character infront
114-
int frontOrderLayer = OrderLayerObject.sortingOrder + ClimbableManager.SORTING_ORDER_INFRONT_OFFSET;
118+
int frontOrderLayer = OrderLayerObject.sortingOrder + cm.SORTING_ORDER_INFRONT_OFFSET;
115119
SetPlayerSortingOrder(player, frontOrderLayer);
116120

117121

@@ -129,7 +133,7 @@ public override void ClimbableUpdate()
129133
player.JustClimbOnTopOfBox = true;
130134

131135
// show character behind the ladder
132-
int backOrderLayer = OrderLayerObject.sortingOrder - ClimbableManager.SORTING_ORDER_BEHIND_OFFSET;
136+
int backOrderLayer = OrderLayerObject.sortingOrder - cm.SORTING_ORDER_BEHIND_OFFSET;
133137
SetPlayerSortingOrder(player, backOrderLayer);
134138
}
135139
}

‎Assets/JCSUnity/Scripts/GameObject/2D/JCS_2DPortal.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ public class JCS_2DPortal
3737
[SerializeField]
3838
private JCS_2DPortalType mType = JCS_2DPortalType.SCENE_PORTAL;
3939

40-
41-
//** SCENE_PORTAL
42-
[Header("** Scene Portal Settings (JCS_2DPortal) **")]
40+
[Header("- Scene Portal")]
4341

4442
[Tooltip("Name of the scene.")]
4543
[SerializeField]
@@ -49,15 +47,12 @@ public class JCS_2DPortal
4947
[SerializeField]
5048
private JCS_PortalLabel mPortalLabel = JCS_PortalLabel.NONE;
5149

52-
53-
//** TRANSFER_PORTAL
54-
[Header("** Transfer Portal Settings (JCS_2DPortal) **")]
50+
[Header("- Transfer Portal")]
5551

5652
[Tooltip("Pair portal, target portal the player will transfer to.")]
5753
[SerializeField]
5854
private Transform mTargetPortal = null;
5955

60-
6156
/* Setter & Getter */
6257

6358
public bool Active { get { return this.mActive; } }
@@ -67,7 +62,6 @@ public class JCS_2DPortal
6762
public Transform TargetPortal { get { return this.mTargetPortal; } set { this.mTargetPortal = value; } }
6863
public JCS_PortalLabel PortalLabel { get { return this.mPortalLabel; } }
6964

70-
7165
/* Functions */
7266

7367
private void Awake()

‎Assets/JCSUnity/Scripts/Settings/Indie/NOTICE.txt‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Assets/JCSUnity/Scripts/Settings/JCS_ApplicationSettings.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public class JCS_ApplicationSettings
2626
// per application is starts.
2727
public ApplicationStartsCallback onApplicationStarts = null;
2828

29-
3029
[Header("** Check Variables (JCS_ApplicationSettings) **")]
3130

3231
[Tooltip("Is the application start?")]

0 commit comments

Comments
 (0)