Skip to content

Commit 9932977

Browse files
committed
Full fill fixed bug on version 1.3.9
1 parent 5ac9aed commit 9932977

29 files changed

+566
-95
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ingnore the those directory
1+
# ignore the those directory
22
/.git
33
/.vs
44
/Temp
@@ -36,4 +36,3 @@ sysinfo.txt
3636
# Builds
3737
*.apk
3838
*.unitypackage
39-

Assets/FrameworkTest_Assets/Scripts/ScreenSpace_Test.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public class ScreenSpace_Test
4040
// setter / getter
4141
//------------------------------
4242
public SpriteRenderer SpriteRenderer { get { return this.mSpriteRenderer; } }
43+
public Transform TransformTemp { get { return this.mTransform; } }
44+
public Transform TransformShow { get { return this.mTransformShow; } }
4345

4446
//========================================
4547
// Unity's function

Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAIDemo.unity

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6012,6 +6012,11 @@ Prefab:
60126012
propertyPath: mFreezeY
60136013
value: 0
60146014
objectReference: {fileID: 0}
6015+
- target: {fileID: 114000012675170792, guid: 03b8a2ed0bd29f040a9f140a75ef08e4,
6016+
type: 2}
6017+
propertyPath: mRandPosX
6018+
value: 40
6019+
objectReference: {fileID: 0}
60156020
m_RemovedComponents: []
60166021
m_ParentPrefab: {fileID: 100100000, guid: 03b8a2ed0bd29f040a9f140a75ef08e4, type: 2}
60176022
m_IsPrefabParent: 0

Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAnimationDemo.unity

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ MonoBehaviour:
297297
- {fileID: 21300000, guid: 50d60beb7d0624c469b3aa65604c685a, type: 3}
298298
- {fileID: 21300000, guid: 0e919dcd2a741474a90cecb96f051198, type: 3}
299299
- {fileID: 21300000, guid: 8637a3d6d60e22f4a903be269bf609b9, type: 3}
300+
mAnimationTimeProduction: 1
300301
--- !u!212 &130550168
301302
SpriteRenderer:
302303
m_ObjectHideFlags: 0
@@ -384,6 +385,7 @@ MonoBehaviour:
384385
mAnimFrames:
385386
- {fileID: 21300000, guid: 185b0df9c7d81384b8ce2187c2fbd673, type: 3}
386387
- {fileID: 21300000, guid: 41d92add017e6314c8b0b7122bf9e565, type: 3}
388+
mAnimationTimeProduction: 1
387389
--- !u!212 &154423135
388390
SpriteRenderer:
389391
m_ObjectHideFlags: 0
@@ -581,6 +583,7 @@ MonoBehaviour:
581583
- {fileID: 21300000, guid: 3d6b51223ce91cc4da56e38506735d1f, type: 3}
582584
- {fileID: 21300000, guid: 19cbd17fc667d7d47b0daa05a7e49e25, type: 3}
583585
- {fileID: 21300000, guid: 77a6a7121cc686f4c90cc9845f60e494, type: 3}
586+
mAnimationTimeProduction: 1
584587
--- !u!212 &339482941
585588
SpriteRenderer:
586589
m_ObjectHideFlags: 0
@@ -671,6 +674,7 @@ MonoBehaviour:
671674
- {fileID: 21300000, guid: ac80f7f797ba1664cb385907ed28c623, type: 3}
672675
- {fileID: 21300000, guid: b7c1ad346ae7cda48b59ac482d964bed, type: 3}
673676
- {fileID: 21300000, guid: f9c8d494617070e429e7f1c4228ca980, type: 3}
677+
mAnimationTimeProduction: 1
674678
--- !u!212 &529122714
675679
SpriteRenderer:
676680
m_ObjectHideFlags: 0
@@ -816,6 +820,7 @@ MonoBehaviour:
816820
- {fileID: 21300000, guid: 1c4e088e7b34ba944a7df0a03f7583f8, type: 3}
817821
- {fileID: 21300000, guid: 54b2ae3cd8303fd4988844d9b02b61eb, type: 3}
818822
- {fileID: 21300000, guid: 5563670d9d1f17e4f8020c11d96cb7ef, type: 3}
823+
mAnimationTimeProduction: 1
819824
--- !u!212 &809204001
820825
SpriteRenderer:
821826
m_ObjectHideFlags: 0
@@ -890,6 +895,7 @@ MonoBehaviour:
890895
mAnimFrames:
891896
- {fileID: 21300000, guid: aa950c18c50be684b8c0297eee081237, type: 3}
892897
- {fileID: 21300000, guid: 0efb0861c50be9144873d64bc2f3eb3d, type: 3}
898+
mAnimationTimeProduction: 1
893899
--- !u!212 &923275530
894900
SpriteRenderer:
895901
m_ObjectHideFlags: 0
@@ -979,6 +985,7 @@ MonoBehaviour:
979985
- {fileID: 21300000, guid: 3d6b51223ce91cc4da56e38506735d1f, type: 3}
980986
- {fileID: 21300000, guid: 19cbd17fc667d7d47b0daa05a7e49e25, type: 3}
981987
- {fileID: 21300000, guid: 77a6a7121cc686f4c90cc9845f60e494, type: 3}
988+
mAnimationTimeProduction: 1
982989
--- !u!212 &931973090
983990
SpriteRenderer:
984991
m_ObjectHideFlags: 0
@@ -1141,6 +1148,7 @@ MonoBehaviour:
11411148
- {fileID: 21300000, guid: fbf8b0a73d61f01459d2d6b4859109b2, type: 3}
11421149
- {fileID: 21300000, guid: c4e74c9e758d7474b99dc7f10c8069c2, type: 3}
11431150
- {fileID: 21300000, guid: 6b020478735905a45b2c60f0ec5a608e, type: 3}
1151+
mAnimationTimeProduction: 1
11441152
--- !u!212 &1119473928
11451153
SpriteRenderer:
11461154
m_ObjectHideFlags: 0
@@ -1633,6 +1641,7 @@ MonoBehaviour:
16331641
m_Name:
16341642
m_EditorClassIdentifier:
16351643
mType: 1
1644+
mPauseGameWhileLoadingScene: 1
16361645
mJCSBlackScreen: {fileID: 0}
16371646
mAlign: 0
16381647
mJCSBlackSlideScreen: {fileID: 0}
@@ -1968,6 +1977,7 @@ MonoBehaviour:
19681977
mAnimFrames:
19691978
- {fileID: 21300000, guid: aa950c18c50be684b8c0297eee081237, type: 3}
19701979
- {fileID: 21300000, guid: 0efb0861c50be9144873d64bc2f3eb3d, type: 3}
1980+
mAnimationTimeProduction: 1
19711981
--- !u!212 &1529246860
19721982
SpriteRenderer:
19731983
m_ObjectHideFlags: 0
@@ -2147,6 +2157,7 @@ MonoBehaviour:
21472157
- {fileID: 21300000, guid: ac80f7f797ba1664cb385907ed28c623, type: 3}
21482158
- {fileID: 21300000, guid: b7c1ad346ae7cda48b59ac482d964bed, type: 3}
21492159
- {fileID: 21300000, guid: f9c8d494617070e429e7f1c4228ca980, type: 3}
2160+
mAnimationTimeProduction: 1
21502161
--- !u!212 &1992397045
21512162
SpriteRenderer:
21522163
m_ObjectHideFlags: 0
@@ -2277,6 +2288,7 @@ MonoBehaviour:
22772288
- {fileID: 21300000, guid: 1c4e088e7b34ba944a7df0a03f7583f8, type: 3}
22782289
- {fileID: 21300000, guid: 54b2ae3cd8303fd4988844d9b02b61eb, type: 3}
22792290
- {fileID: 21300000, guid: 5563670d9d1f17e4f8020c11d96cb7ef, type: 3}
2291+
mAnimationTimeProduction: 1
22802292
--- !u!212 &2117824359
22812293
SpriteRenderer:
22822294
m_ObjectHideFlags: 0

Assets/JCSUnity/Scenes/Demo/JCS_InGameLogDemo.unity

Lines changed: 107 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!29 &1
4-
SceneSettings:
4+
OcclusionCullingSettings:
55
m_ObjectHideFlags: 0
6-
m_PVSData:
7-
m_PVSObjectsArray: []
8-
m_PVSPortalsArray: []
6+
serializedVersion: 2
97
m_OcclusionBakeSettings:
108
smallestOccluder: 5
119
smallestHole: 0.25
1210
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
@@ -79,16 +79,17 @@ NavMeshSettings:
7979
m_ObjectHideFlags: 0
8080
m_BuildSettings:
8181
serializedVersion: 2
82+
agentTypeID: 0
8283
agentRadius: 0.5
8384
agentHeight: 2
8485
agentSlope: 45
8586
agentClimb: 0.4
8687
ledgeDropHeight: 0
8788
maxJumpAcrossDistance: 0
88-
accuratePlacement: 0
8989
minRegionArea: 2
90-
cellSize: 0.16666667
9190
manualCellSize: 0
91+
cellSize: 0.16666667
92+
accuratePlacement: 0
9293
m_NavMeshData: {fileID: 0}
9394
--- !u!224 &48297103 stripped
9495
RectTransform:
@@ -186,11 +187,11 @@ Prefab:
186187
objectReference: {fileID: 0}
187188
- target: {fileID: 22430298, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
188189
propertyPath: m_AnchoredPosition.x
189-
value: 1063
190+
value: 968
190191
objectReference: {fileID: 0}
191192
- target: {fileID: 22430298, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
192193
propertyPath: m_AnchoredPosition.y
193-
value: -525
194+
value: -494
194195
objectReference: {fileID: 0}
195196
- target: {fileID: 22430298, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
196197
propertyPath: m_SizeDelta.x
@@ -224,6 +225,10 @@ Prefab:
224225
propertyPath: m_Pivot.y
225226
value: 0.5
226227
objectReference: {fileID: 0}
228+
- target: {fileID: 11493504, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
229+
propertyPath: mLogSpacing
230+
value: 40
231+
objectReference: {fileID: 0}
227232
m_RemovedComponents: []
228233
m_ParentPrefab: {fileID: 100100000, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
229234
m_IsPrefabParent: 0
@@ -232,10 +237,10 @@ GameObject:
232237
m_ObjectHideFlags: 0
233238
m_PrefabParentObject: {fileID: 0}
234239
m_PrefabInternal: {fileID: 0}
235-
serializedVersion: 4
240+
serializedVersion: 5
236241
m_Component:
237-
- 224: {fileID: 634508300}
238-
- 114: {fileID: 634508301}
242+
- component: {fileID: 634508300}
243+
- component: {fileID: 634508301}
239244
m_Layer: 5
240245
m_Name: Root
241246
m_TagString: Untagged
@@ -252,11 +257,11 @@ RectTransform:
252257
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
253258
m_LocalPosition: {x: 0, y: 0, z: 0}
254259
m_LocalScale: {x: 1, y: 1, z: 1}
255-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
256260
m_Children:
257261
- {fileID: 48297103}
258262
m_Father: {fileID: 953878243}
259263
m_RootOrder: 1
264+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
260265
m_AnchorMin: {x: 0.5, y: 0.5}
261266
m_AnchorMax: {x: 0.5, y: 0.5}
262267
m_AnchoredPosition: {x: -0.18359375, y: 0.675354}
@@ -389,12 +394,13 @@ RectTransform:
389394
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
390395
m_LocalPosition: {x: 0, y: 0, z: 0}
391396
m_LocalScale: {x: 0, y: 0, z: 0}
392-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
393397
m_Children:
394398
- {fileID: 2106760868}
395399
- {fileID: 634508300}
400+
- {fileID: 2141910605}
396401
m_Father: {fileID: 0}
397402
m_RootOrder: 5
403+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
398404
m_AnchorMin: {x: 0, y: 0}
399405
m_AnchorMax: {x: 0, y: 0}
400406
m_AnchoredPosition: {x: 0, y: 0}
@@ -489,13 +495,13 @@ GameObject:
489495
m_ObjectHideFlags: 0
490496
m_PrefabParentObject: {fileID: 107462, guid: 9703af89983ee9c44843a0501571b178, type: 2}
491497
m_PrefabInternal: {fileID: 0}
492-
serializedVersion: 4
498+
serializedVersion: 5
493499
m_Component:
494-
- 224: {fileID: 953878243}
495-
- 223: {fileID: 1315914502}
496-
- 114: {fileID: 1315914501}
497-
- 114: {fileID: 1315914500}
498-
- 114: {fileID: 1315914499}
500+
- component: {fileID: 953878243}
501+
- component: {fileID: 1315914502}
502+
- component: {fileID: 1315914501}
503+
- component: {fileID: 1315914500}
504+
- component: {fileID: 1315914499}
499505
m_Layer: 5
500506
m_Name: JCS_Canvas
501507
m_TagString: Untagged
@@ -668,11 +674,11 @@ Prefab:
668674
objectReference: {fileID: 0}
669675
- target: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d, type: 2}
670676
propertyPath: m_SizeDelta.x
671-
value: 160
677+
value: 320
672678
objectReference: {fileID: 0}
673679
- target: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d, type: 2}
674680
propertyPath: m_SizeDelta.y
675-
value: 30
681+
value: 60
676682
objectReference: {fileID: 0}
677683
- target: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d, type: 2}
678684
propertyPath: m_AnchorMin.x
@@ -706,3 +712,83 @@ RectTransform:
706712
m_PrefabParentObject: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d,
707713
type: 2}
708714
m_PrefabInternal: {fileID: 2106760867}
715+
--- !u!1 &2141910604
716+
GameObject:
717+
m_ObjectHideFlags: 0
718+
m_PrefabParentObject: {fileID: 0}
719+
m_PrefabInternal: {fileID: 0}
720+
serializedVersion: 5
721+
m_Component:
722+
- component: {fileID: 2141910605}
723+
- component: {fileID: 2141910607}
724+
- component: {fileID: 2141910606}
725+
m_Layer: 5
726+
m_Name: Plz delete this desc...
727+
m_TagString: Untagged
728+
m_Icon: {fileID: 0}
729+
m_NavMeshLayer: 0
730+
m_StaticEditorFlags: 0
731+
m_IsActive: 1
732+
--- !u!224 &2141910605
733+
RectTransform:
734+
m_ObjectHideFlags: 0
735+
m_PrefabParentObject: {fileID: 0}
736+
m_PrefabInternal: {fileID: 0}
737+
m_GameObject: {fileID: 2141910604}
738+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
739+
m_LocalPosition: {x: 0, y: 0, z: 0}
740+
m_LocalScale: {x: 1, y: 1, z: 1}
741+
m_Children: []
742+
m_Father: {fileID: 953878243}
743+
m_RootOrder: 2
744+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
745+
m_AnchorMin: {x: 0.5, y: 0.5}
746+
m_AnchorMax: {x: 0.5, y: 0.5}
747+
m_AnchoredPosition: {x: -752, y: 428}
748+
m_SizeDelta: {x: 160, y: 30}
749+
m_Pivot: {x: 0.5, y: 0.5}
750+
--- !u!114 &2141910606
751+
MonoBehaviour:
752+
m_ObjectHideFlags: 0
753+
m_PrefabParentObject: {fileID: 0}
754+
m_PrefabInternal: {fileID: 0}
755+
m_GameObject: {fileID: 2141910604}
756+
m_Enabled: 1
757+
m_EditorHideFlags: 0
758+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
759+
m_Name:
760+
m_EditorClassIdentifier:
761+
m_Material: {fileID: 0}
762+
m_Color: {r: 1, g: 1, b: 1, a: 1}
763+
m_RaycastTarget: 1
764+
m_OnCullStateChanged:
765+
m_PersistentCalls:
766+
m_Calls: []
767+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
768+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
769+
m_FontData:
770+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
771+
m_FontSize: 40
772+
m_FontStyle: 0
773+
m_BestFit: 0
774+
m_MinSize: 0
775+
m_MaxSize: 60
776+
m_Alignment: 0
777+
m_AlignByGeometry: 0
778+
m_RichText: 1
779+
m_HorizontalOverflow: 1
780+
m_VerticalOverflow: 1
781+
m_LineSpacing: 1
782+
m_Text: '** IGLogSystem Demo **
783+
784+
1) Press ''Q'' will send "Hello World!" log.
785+
786+
2) Press ''W'' will send "Exp: 10" log.
787+
788+
3) Press ''E'' will send "Ok", "Cool?", "Awesome!" log.'
789+
--- !u!222 &2141910607
790+
CanvasRenderer:
791+
m_ObjectHideFlags: 0
792+
m_PrefabParentObject: {fileID: 0}
793+
m_PrefabInternal: {fileID: 0}
794+
m_GameObject: {fileID: 2141910604}

Assets/JCSUnity/Scripts/Actions/2D/JCS_2DSimpleInvincibleTimeAction.cs renamed to Assets/JCSUnity/Scripts/Actions/2D/JCS_SimpleInvincibleTimeAction.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* $File: JCS_2DSimpleInvincibleTimeAction.cs $
2+
* $File: JCS_SimpleInvincibleTimeAction.cs $
33
* $Date: 2017-03-16 $
44
* $Revision: $
55
* $Creator: Jen-Chieh Shen $
@@ -17,7 +17,7 @@ namespace JCSUnity
1717
/// <summary>
1818
/// Simple call invincible time action.
1919
/// </summary>
20-
public class JCS_2DSimpleInvincibleTimeAction
20+
public class JCS_SimpleInvincibleTimeAction
2121
: JCS_UnityObject
2222
{
2323
//----------------------
@@ -27,7 +27,7 @@ public class JCS_2DSimpleInvincibleTimeAction
2727
// Private Variables
2828

2929

30-
[Header("** Runtime Variables (JCS_2DSimpleInvincibleTimeAction) **")]
30+
[Header("** Runtime Variables (JCS_SimpleInvincibleTimeAction) **")]
3131

3232
[Tooltip("")]
3333
[SerializeField]
@@ -39,7 +39,7 @@ public class JCS_2DSimpleInvincibleTimeAction
3939
// trigger the invincible time action?
4040
private bool mTriggerAction = false;
4141

42-
[Header("- Flash Effect (JCS_2DSimpleInvincibleTimeAction) ")]
42+
[Header("- Flash Effect (JCS_SimpleInvincibleTimeAction) ")]
4343

4444
[Tooltip("Color when is invincible.")]
4545
[SerializeField]
@@ -70,6 +70,9 @@ public class JCS_2DSimpleInvincibleTimeAction
7070
//========================================
7171
// setter / getter
7272
//------------------------------
73+
public float InvicibleTime { get { return this.mInvicibleTime; } set { this.mInvicibleTime = value; } }
74+
// Use to check if this effect is active?
75+
public bool IsInvincible { get { return this.mTriggerAction; } }
7376

7477
//========================================
7578
// Unity's function

Assets/JCSUnity/Scripts/Actions/2D/JCS_2DSimpleInvincibleTimeAction.cs.meta renamed to Assets/JCSUnity/Scripts/Actions/2D/JCS_SimpleInvincibleTimeAction.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)