Full fill fixed bug on version 1.3.9

jcs090218 · Apr 4, 2017 · 9932977 · 9932977
1 parent 5ac9aed
commit 9932977
Show file tree

Hide file tree

Showing 29 changed files with 566 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# ingnore the those directory
+# ignore the those directory
 /.git
 /.vs
 /Temp
@@ -36,4 +36,3 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
-
diff --git a/Assets/FrameworkTest_Assets/Scripts/ScreenSpace_Test.cs b/Assets/FrameworkTest_Assets/Scripts/ScreenSpace_Test.cs
@@ -40,6 +40,8 @@ public class ScreenSpace_Test
     //      setter / getter
     //------------------------------
     public SpriteRenderer SpriteRenderer { get { return this.mSpriteRenderer; } }
+    public Transform TransformTemp { get { return this.mTransform; } }
+    public Transform TransformShow { get { return this.mTransformShow; } }
 
     //========================================
     //      Unity's function

diff --git a/Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAIDemo.unity b/Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAIDemo.unity
@@ -6012,6 +6012,11 @@ Prefab:
       propertyPath: mFreezeY
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 114000012675170792, guid: 03b8a2ed0bd29f040a9f140a75ef08e4,
+        type: 2}
+      propertyPath: mRandPosX
+      value: 40
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 03b8a2ed0bd29f040a9f140a75ef08e4, type: 2}
   m_IsPrefabParent: 0

diff --git a/Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAnimationDemo.unity b/Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAnimationDemo.unity
@@ -297,6 +297,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 50d60beb7d0624c469b3aa65604c685a, type: 3}
   - {fileID: 21300000, guid: 0e919dcd2a741474a90cecb96f051198, type: 3}
   - {fileID: 21300000, guid: 8637a3d6d60e22f4a903be269bf609b9, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &130550168
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -384,6 +385,7 @@ MonoBehaviour:
   mAnimFrames:
   - {fileID: 21300000, guid: 185b0df9c7d81384b8ce2187c2fbd673, type: 3}
   - {fileID: 21300000, guid: 41d92add017e6314c8b0b7122bf9e565, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &154423135
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -581,6 +583,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 3d6b51223ce91cc4da56e38506735d1f, type: 3}
   - {fileID: 21300000, guid: 19cbd17fc667d7d47b0daa05a7e49e25, type: 3}
   - {fileID: 21300000, guid: 77a6a7121cc686f4c90cc9845f60e494, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &339482941
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -671,6 +674,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: ac80f7f797ba1664cb385907ed28c623, type: 3}
   - {fileID: 21300000, guid: b7c1ad346ae7cda48b59ac482d964bed, type: 3}
   - {fileID: 21300000, guid: f9c8d494617070e429e7f1c4228ca980, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &529122714
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -816,6 +820,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 1c4e088e7b34ba944a7df0a03f7583f8, type: 3}
   - {fileID: 21300000, guid: 54b2ae3cd8303fd4988844d9b02b61eb, type: 3}
   - {fileID: 21300000, guid: 5563670d9d1f17e4f8020c11d96cb7ef, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &809204001
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -890,6 +895,7 @@ MonoBehaviour:
   mAnimFrames:
   - {fileID: 21300000, guid: aa950c18c50be684b8c0297eee081237, type: 3}
   - {fileID: 21300000, guid: 0efb0861c50be9144873d64bc2f3eb3d, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &923275530
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -979,6 +985,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 3d6b51223ce91cc4da56e38506735d1f, type: 3}
   - {fileID: 21300000, guid: 19cbd17fc667d7d47b0daa05a7e49e25, type: 3}
   - {fileID: 21300000, guid: 77a6a7121cc686f4c90cc9845f60e494, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &931973090
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -1141,6 +1148,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: fbf8b0a73d61f01459d2d6b4859109b2, type: 3}
   - {fileID: 21300000, guid: c4e74c9e758d7474b99dc7f10c8069c2, type: 3}
   - {fileID: 21300000, guid: 6b020478735905a45b2c60f0ec5a608e, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &1119473928
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -1633,6 +1641,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 1
+  mPauseGameWhileLoadingScene: 1
   mJCSBlackScreen: {fileID: 0}
   mAlign: 0
   mJCSBlackSlideScreen: {fileID: 0}
@@ -1968,6 +1977,7 @@ MonoBehaviour:
   mAnimFrames:
   - {fileID: 21300000, guid: aa950c18c50be684b8c0297eee081237, type: 3}
   - {fileID: 21300000, guid: 0efb0861c50be9144873d64bc2f3eb3d, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &1529246860
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -2147,6 +2157,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: ac80f7f797ba1664cb385907ed28c623, type: 3}
   - {fileID: 21300000, guid: b7c1ad346ae7cda48b59ac482d964bed, type: 3}
   - {fileID: 21300000, guid: f9c8d494617070e429e7f1c4228ca980, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &1992397045
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -2277,6 +2288,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 1c4e088e7b34ba944a7df0a03f7583f8, type: 3}
   - {fileID: 21300000, guid: 54b2ae3cd8303fd4988844d9b02b61eb, type: 3}
   - {fileID: 21300000, guid: 5563670d9d1f17e4f8020c11d96cb7ef, type: 3}
+  mAnimationTimeProduction: 1
 --- !u!212 &2117824359
 SpriteRenderer:
   m_ObjectHideFlags: 0

diff --git a/Assets/JCSUnity/Scenes/Demo/JCS_InGameLogDemo.unity b/Assets/JCSUnity/Scenes/Demo/JCS_InGameLogDemo.unity
@@ -1,15 +1,15 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!29 &1
-SceneSettings:
+OcclusionCullingSettings:
   m_ObjectHideFlags: 0
-  m_PVSData: 
-  m_PVSObjectsArray: []
-  m_PVSPortalsArray: []
+  serializedVersion: 2
   m_OcclusionBakeSettings:
     smallestOccluder: 5
     smallestHole: 0.25
     backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
@@ -79,16 +79,17 @@ NavMeshSettings:
   m_ObjectHideFlags: 0
   m_BuildSettings:
     serializedVersion: 2
+    agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
     agentSlope: 45
     agentClimb: 0.4
     ledgeDropHeight: 0
     maxJumpAcrossDistance: 0
-    accuratePlacement: 0
     minRegionArea: 2
-    cellSize: 0.16666667
     manualCellSize: 0
+    cellSize: 0.16666667
+    accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
 --- !u!224 &48297103 stripped
 RectTransform:
@@ -186,11 +187,11 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 22430298, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
       propertyPath: m_AnchoredPosition.x
-      value: 1063
+      value: 968
       objectReference: {fileID: 0}
     - target: {fileID: 22430298, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
       propertyPath: m_AnchoredPosition.y
-      value: -525
+      value: -494
       objectReference: {fileID: 0}
     - target: {fileID: 22430298, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
       propertyPath: m_SizeDelta.x
@@ -224,6 +225,10 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 11493504, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
+      propertyPath: mLogSpacing
+      value: 40
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: f6ec079847eaf934f954938bf36fbc30, type: 2}
   m_IsPrefabParent: 0
@@ -232,10 +237,10 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 224: {fileID: 634508300}
-  - 114: {fileID: 634508301}
+  - component: {fileID: 634508300}
+  - component: {fileID: 634508301}
   m_Layer: 5
   m_Name: Root
   m_TagString: Untagged
@@ -252,11 +257,11 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 48297103}
   m_Father: {fileID: 953878243}
   m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.18359375, y: 0.675354}
@@ -389,12 +394,13 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 2106760868}
   - {fileID: 634508300}
+  - {fileID: 2141910605}
   m_Father: {fileID: 0}
   m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -489,13 +495,13 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 107462, guid: 9703af89983ee9c44843a0501571b178, type: 2}
   m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 224: {fileID: 953878243}
-  - 223: {fileID: 1315914502}
-  - 114: {fileID: 1315914501}
-  - 114: {fileID: 1315914500}
-  - 114: {fileID: 1315914499}
+  - component: {fileID: 953878243}
+  - component: {fileID: 1315914502}
+  - component: {fileID: 1315914501}
+  - component: {fileID: 1315914500}
+  - component: {fileID: 1315914499}
   m_Layer: 5
   m_Name: JCS_Canvas
   m_TagString: Untagged
@@ -668,11 +674,11 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d, type: 2}
       propertyPath: m_SizeDelta.x
-      value: 160
+      value: 320
       objectReference: {fileID: 0}
     - target: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d, type: 2}
       propertyPath: m_SizeDelta.y
-      value: 30
+      value: 60
       objectReference: {fileID: 0}
     - target: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d, type: 2}
       propertyPath: m_AnchorMin.x
@@ -706,3 +712,83 @@ RectTransform:
   m_PrefabParentObject: {fileID: 22429998, guid: eb0f5d18a4dfb484eb4c894d0c65173d,
     type: 2}
   m_PrefabInternal: {fileID: 2106760867}
+--- !u!1 &2141910604
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 2141910605}
+  - component: {fileID: 2141910607}
+  - component: {fileID: 2141910606}
+  m_Layer: 5
+  m_Name: Plz delete this desc...
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2141910605
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2141910604}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 953878243}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -752, y: 428}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2141910606
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2141910604}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 60
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: '** IGLogSystem Demo **
+
+    1) Press ''Q'' will send "Hello World!" log.
+
+    2) Press ''W'' will send "Exp: 10" log.
+
+    3) Press ''E'' will send "Ok", "Cool?", "Awesome!" log.'
+--- !u!222 &2141910607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2141910604}
diff --git a/...ns/2D/JCS_2DSimpleInvincibleTimeAction.cs → ...ions/2D/JCS_SimpleInvincibleTimeAction.cs b/...ns/2D/JCS_2DSimpleInvincibleTimeAction.cs → ...ions/2D/JCS_SimpleInvincibleTimeAction.cs
@@ -1,5 +1,5 @@
 /**
- * $File: JCS_2DSimpleInvincibleTimeAction.cs $
+ * $File: JCS_SimpleInvincibleTimeAction.cs $
  * $Date: 2017-03-16 $
  * $Revision: $
  * $Creator: Jen-Chieh Shen $
@@ -17,7 +17,7 @@ namespace JCSUnity
     /// <summary>
     /// Simple call invincible time action.
     /// </summary>
-    public class JCS_2DSimpleInvincibleTimeAction
+    public class JCS_SimpleInvincibleTimeAction
         : JCS_UnityObject
     {
         //----------------------
@@ -27,7 +27,7 @@ public class JCS_2DSimpleInvincibleTimeAction
         // Private Variables
 
 
-        [Header("** Runtime Variables (JCS_2DSimpleInvincibleTimeAction) **")]
+        [Header("** Runtime Variables (JCS_SimpleInvincibleTimeAction) **")]
 
         [Tooltip("")]
         [SerializeField]
@@ -39,7 +39,7 @@ public class JCS_2DSimpleInvincibleTimeAction
         // trigger the invincible time action?
         private bool mTriggerAction = false;
 
-        [Header("- Flash Effect (JCS_2DSimpleInvincibleTimeAction) ")]
+        [Header("- Flash Effect (JCS_SimpleInvincibleTimeAction) ")]
 
         [Tooltip("Color when is invincible.")]
         [SerializeField]
@@ -70,6 +70,9 @@ public class JCS_2DSimpleInvincibleTimeAction
         //========================================
         //      setter / getter
         //------------------------------
+        public float InvicibleTime { get { return this.mInvicibleTime; } set { this.mInvicibleTime = value; } }
+        // Use to check if this effect is active?
+        public bool IsInvincible { get { return this.mTriggerAction; } }
 
         //========================================
         //      Unity's function

diff --git a/.../JCS_2DSimpleInvincibleTimeAction.cs.meta → ...2D/JCS_SimpleInvincibleTimeAction.cs.meta b/.../JCS_2DSimpleInvincibleTimeAction.cs.meta → ...2D/JCS_SimpleInvincibleTimeAction.cs.meta