add sprite timer compatible with unity object.

jcs090218 · jcs090218 · commit a3f34c48d603 · 2017-10-06T12:16:06.000+08:00
diff --git a/Assets/JCSUnity/Scenes/Demo/JCS_SpriteScoreDemo.unity b/Assets/JCSUnity/Scenes/Demo/JCS_SpriteScoreDemo.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 8
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
   m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
   m_SkyboxMaterial: {fileID: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 4
+    serializedVersion: 9
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
+    m_MixedBakeMode: 1
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFiltering: 0
+    m_PVRFilteringMode: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousColorSigma: 1
+    m_PVRFilteringAtrousNormalSigma: 1
+    m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
-  m_RuntimeCPUUsage: 25
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
     minRegionArea: 2
     manualCellSize: 0
     cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &41212418
@@ -158,12 +175,13 @@ MonoBehaviour:
   - {fileID: 1729203409}
   - {fileID: 1787777337}
   mDigitInterval: 150
-  mDeltaToCurrentScore: 1
-  mTargetScore: 0
-  mAnimScoreTime: 0.01
   mClearEmptyLeftZero: 1
   mMaxScore: 9999999
   mMinScore: 0
+  mDeltaToCurrentScore: 1
+  mTargetScore: 0
+  mAnimScoreTime: 0.01
+  mDeltaProduct: 1
 --- !u!1001 &64923396
 Prefab:
   m_ObjectHideFlags: 0
@@ -205,11 +223,143 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 1070574947317226, guid: a313cef25dcbf694a8c1fe6ffb4e421a, type: 2}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 114254833641694206, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+        type: 2}
+      propertyPath: mDigitHour1
+      value: 
+      objectReference: {fileID: 64923405}
+    - target: {fileID: 114254833641694206, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+        type: 2}
+      propertyPath: mDigitMinute1
+      value: 
+      objectReference: {fileID: 64923408}
+    - target: {fileID: 114254833641694206, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+        type: 2}
+      propertyPath: mDigitHour2
+      value: 
+      objectReference: {fileID: 64923403}
+    - target: {fileID: 114254833641694206, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+        type: 2}
+      propertyPath: mDigitMinute2
+      value: 
+      objectReference: {fileID: 64923407}
+    - target: {fileID: 114254833641694206, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+        type: 2}
+      propertyPath: mDigitSecond1
+      value: 
+      objectReference: {fileID: 64923406}
+    - target: {fileID: 114254833641694206, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+        type: 2}
+      propertyPath: mDigitSecond2
+      value: 
+      objectReference: {fileID: 64923404}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: a313cef25dcbf694a8c1fe6ffb4e421a, type: 2}
   m_IsPrefabParent: 0
+--- !u!1 &64923397 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1258492754714492, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+    type: 2}
+  m_PrefabInternal: {fileID: 64923396}
+--- !u!1 &64923398 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1754451718414538, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+    type: 2}
+  m_PrefabInternal: {fileID: 64923396}
+--- !u!1 &64923399 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1835343002068600, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+    type: 2}
+  m_PrefabInternal: {fileID: 64923396}
+--- !u!1 &64923400 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1401213060282032, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+    type: 2}
+  m_PrefabInternal: {fileID: 64923396}
+--- !u!1 &64923401 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1450482187599614, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+    type: 2}
+  m_PrefabInternal: {fileID: 64923396}
+--- !u!1 &64923402 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1685202260400530, guid: a313cef25dcbf694a8c1fe6ffb4e421a,
+    type: 2}
+  m_PrefabInternal: {fileID: 64923396}
+--- !u!114 &64923403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 64923397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c8cab002cb9b674eb85fd19be27dbfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mObjectType: 2
+--- !u!114 &64923404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 64923398}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c8cab002cb9b674eb85fd19be27dbfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mObjectType: 2
+--- !u!114 &64923405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 64923399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c8cab002cb9b674eb85fd19be27dbfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mObjectType: 2
+--- !u!114 &64923406
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 64923400}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c8cab002cb9b674eb85fd19be27dbfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mObjectType: 2
+--- !u!114 &64923407
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 64923401}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c8cab002cb9b674eb85fd19be27dbfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mObjectType: 2
+--- !u!114 &64923408
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 64923402}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c8cab002cb9b674eb85fd19be27dbfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mObjectType: 2
 --- !u!1 &209124775
 GameObject:
   m_ObjectHideFlags: 0
@@ -445,7 +595,7 @@ Canvas:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 302384168}
   m_Enabled: 1
-  serializedVersion: 2
+  serializedVersion: 3
   m_RenderMode: 1
   m_Camera: {fileID: 906034307}
   m_PlaneDistance: 100
@@ -454,6 +604,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
   m_SortingOrder: 25
   m_TargetDisplay: 0
@@ -741,6 +892,7 @@ MonoBehaviour:
   mGameUI: {fileID: 0}
   mForceDialogue: {fileID: 0}
   mFocusGameDialogue: {fileID: 0}
+  mFadeScreen: {fileID: 0}
 --- !u!114 &787713868
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1087,6 +1239,7 @@ MonoBehaviour:
   mFreezeY: 0
   mFreezeZ: 0
   mZoomEffect: 1
+  mZoomWithMouse: 1
   mScrollRange: 20
   mScrollFriction: 0.6
   mFrictionX: 0.6
@@ -1139,6 +1292,8 @@ Camera:
   m_TargetDisplay: 0
   m_TargetEye: 3
   m_HDR: 0
+  m_AllowMSAA: 1
+  m_ForceIntoRT: 0
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
@@ -1418,6 +1573,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SCENE_FADEOUT_TIME: 1.5
   SCENE_FADEIN_TIME: 1.5
+  SCREEN_COLOR: {r: 0, g: 0, b: 0, a: 1}
 --- !u!114 &1266454858
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs b/Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs
@@ -103,27 +103,27 @@ public class JCS_SpriteTimer
 
         [Tooltip("Each digit for our.")]
         [SerializeField]
-        private SpriteRenderer mDigitHour1 = null;
+        private JCS_UnityObject mDigitHour1 = null;
 
         [Tooltip("Each digit for our.")]
         [SerializeField]
-        private SpriteRenderer mDigitHour2 = null;
+        private JCS_UnityObject mDigitHour2 = null;
 
         [Tooltip("Each digit for minute.")]
         [SerializeField]
-        private SpriteRenderer mDigitMinute1 = null;
+        private JCS_UnityObject mDigitMinute1 = null;
 
         [Tooltip("Each digit for minute.")]
         [SerializeField]
-        private SpriteRenderer mDigitMinute2 = null;
+        private JCS_UnityObject mDigitMinute2 = null;
 
         [Tooltip("Each digit for second.")]
         [SerializeField]
-        private SpriteRenderer mDigitSecond1 = null;
+        private JCS_UnityObject mDigitSecond1 = null;
 
         [Tooltip("Each digit for second.")]
         [SerializeField]
-        private SpriteRenderer mDigitSecond2 = null;
+        private JCS_UnityObject mDigitSecond2 = null;
 
 
         [Header("- Sprite Settings (JCS_SpriteTimer) ")]
@@ -367,10 +367,10 @@ private void DoHourUI(float hour)
             }
 
             int valDigit = JCS_Mathf.GetSingleDigit(1, (int)hour);
-            mDigitHour1.sprite = GetSingleDigitSprite(valDigit);
+            mDigitHour1.LocalSprite = GetSingleDigitSprite(valDigit);
 
             valDigit = JCS_Mathf.GetSingleDigit(2, (int)hour);
-            mDigitHour2.sprite = GetSingleDigitSprite(valDigit);
+            mDigitHour2.LocalSprite = GetSingleDigitSprite(valDigit);
         }
 
         /// <summary>
@@ -395,10 +395,10 @@ private void DoMinuteUI(float minute)
             }
 
             int valDigit = JCS_Mathf.GetSingleDigit(1, (int)minute);
-            mDigitMinute1.sprite = GetSingleDigitSprite(valDigit);
+            mDigitMinute1.LocalSprite = GetSingleDigitSprite(valDigit);
 
             valDigit = JCS_Mathf.GetSingleDigit(2, (int)minute);
-            mDigitMinute2.sprite = GetSingleDigitSprite(valDigit);
+            mDigitMinute2.LocalSprite = GetSingleDigitSprite(valDigit);
         }
 
         /// <summary>
@@ -423,10 +423,10 @@ private void DoSecondUI(float second)
             }
 
             int valDigit = JCS_Mathf.GetSingleDigit(1, (int)second);
-            mDigitSecond1.sprite = GetSingleDigitSprite(valDigit);
+            mDigitSecond1.LocalSprite = GetSingleDigitSprite(valDigit);
 
             valDigit = JCS_Mathf.GetSingleDigit(2, (int)second);
-            mDigitSecond2.sprite = GetSingleDigitSprite(valDigit);
+            mDigitSecond2.LocalSprite = GetSingleDigitSprite(valDigit);
         }
 
         /// <summary>
diff --git a/Assets/StreamingAssets/build_info.txt b/Assets/StreamingAssets/build_info.txt
@@ -1 +1 @@
-Build from DESKTOP-5QUO247 at 10/3/2017 2:47:59 PM
+Build from DESKTOP-5QUO247 at 10/6/2017 12:13:19 PM

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Build from DESKTOP-5QUO247 at 10/3/2017 2:47:59 PM`
	`1`	`+Build from DESKTOP-5QUO247 at 10/6/2017 12:13:19 PM`