Merge branch 'master' of http://103.147.34.20:30081/trung.ha/galaxysmash

Assets/OSG Infinity Square Space/Scenes/home.unity

@@ -38731,6 +38731,36 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 723667970}
   m_CullTransparentMesh: 1
+--- !u!1 &723730322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 723730323}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &723730323
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 723730322}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 487.3102, y: 991.9576, z: -222.62773}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &727892336 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 124772, guid: 684607a10eed8fd4ca28c636950fa092,

Assets/Scripts/UI/HomeScreen.cs

@@ -24,6 +24,11 @@ public class HomeScreen : MonoBehaviour
         }
         CheckRemoveAds();
         TimeManager.Instance.shopRewardTimer.Callback += timerCallbackFunc;
+        rankUI.ShowRewardNow();
+        //if(rankUI.ShowRewardNow())
+        //{
+        //    // show tut
+        //}
     }
     private void OnDisable()
     {