Merge branch 'master' of http://103.147.34.20:30081/trung.ha/minecraft-hero-merge-battle

Assets/Scripts/Gameplay/GameplayManager.cs

@@ -101,6 +101,7 @@ public class GameplayManager : MonoBehaviour
         GuiManager.Instance.OnIslandScreen();
         EffectManager.Instance.PlayIslandMusic();
     }
+
     public void HideLand()
     {
         currentLevel.ResetSkybox();

Assets/Scripts/Gameplay/Gp_landAnimal.cs

@@ -41,6 +41,7 @@ public class Gp_landAnimal : DinosaurBehavior
                 transform.rotation = Quaternion.Lerp(transform.rotation,
                     Quaternion.LookRotation(dir, Vector3.up), Time.deltaTime * 3f);
             }
+
         }
         else
         {

Assets/Scripts/Manager/FirebaseManager.cs

@@ -223,7 +223,7 @@ public class FirebaseManager : MonoBehaviour
                     showFightSystem = remoteConfig.GetValue("show_fight_system").BooleanValue;
                     timeShowInters = (float)remoteConfig.GetValue("time_show_inters").DoubleValue;
 
-                    useThemeHalloween = remoteConfig.GetValue("use_theme_halloween").BooleanValue; //  bat tat them halloween
+                //    useThemeHalloween = remoteConfig.GetValue("use_theme_halloween").BooleanValue; //  bat tat them halloween
 
                     break;
                 case LastFetchStatus.Failure: