Merge remote-tracking branch 'origin/master' into ios

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -264,49 +264,49 @@ namespace GFGGame
         {
             int indexPrior = Math.Max(0, _curSelectIndex - 1);
             int indexNext = Math.Min(_rechargeCfgs.Count - 1, _curSelectIndex + 1);
-            SetRedDot(indexPrior);
-            SetRedDot(indexNext);
+            TraverseList(indexPrior);
+            TraverseList(indexNext);
         }
 
-        private void SetRedDot(int index)
+        private void TraverseList(int index)
         {
-            long limitChargeExp = _activityInfo.CountValue;
-            if (limitChargeExp >= _rechargeCfgs[index].value)
+            if (index < _curSelectIndex)
             {
-                if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0)
+                for (int i = index; i >= 0; i--)
                 {
-                    if (index < _curSelectIndex)
+                    if(SetRedDot(i))
                     {
-                        RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, false);
-                    }
-                    else
-                    {
-                        RedDotController.Instance.SetComRedDot(_ui.m_btnRight, false);
+                        RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, true);
+                        break;
                     }
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, false);
                 }
-                else
+            }
+            else
+            {
+                for (int i = index; i < _rechargeCfgs.Count; i++)
                 {
-                    if (index < _curSelectIndex)
-                    {
-                        RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, true);
-                    }
-                    else
+                    if (SetRedDot(i))
                     {
                         RedDotController.Instance.SetComRedDot(_ui.m_btnRight, true);
+                        break;
                     }
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnRight, false);
                 }
             }
-            else
+        }
+
+        private bool SetRedDot(int index)
+        {
+            long limitChargeExp = _activityInfo.CountValue;
+            if (limitChargeExp >= _rechargeCfgs[index].value)
             {
-                if (index < _curSelectIndex)
-                {
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, false);
-                }
-                else
+                if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) < 0)
                 {
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnRight, false);
+                    return true;
                 }
             }
+            return false;
         }
         private void OnBtnChargeClick()
         {

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -66,7 +66,9 @@ namespace GFGGame
                     _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", haveNum, needNum);
                 }
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
-                _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
+                //_ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
+                _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");
+
             }
         }
 

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -39,6 +39,7 @@ namespace GFGGame
         public static string apkVersion;
         public static int serverStatus;
         public static int onDebug;
+        public static string manifest_v;
         public static string privacy_v;
 
         public static void InitScriptCompilation()
@@ -85,6 +86,7 @@ namespace GFGGame
             LauncherConfig.apkVersion = result.apkVersion;
             LauncherConfig.serverStatus = int.Parse(result.serverStatus);
             LauncherConfig.onDebug = int.Parse(result.onDebug);
+            LauncherConfig.manifest_v = result.manifest_v;
             LauncherConfig.privacy_v = result.privacy_v;
         }
 
@@ -95,6 +97,7 @@ namespace GFGGame
             public string apkVersion;
             public string serverStatus;
             public string onDebug;
+            public string manifest_v;
             public string privacy_v;
         }
 

GameClient/Assets/Game/Launcher/Version/VersionController.cs

@@ -26,7 +26,14 @@ namespace GFGGame
         public IEnumerator InitVersion()
         {
             yield return InitDefaultPackage();
-            yield return GetStaticVersion(DefaultPackage);
+            if(string.IsNullOrEmpty(LauncherConfig.manifest_v))
+            {
+                yield return GetStaticVersion(DefaultPackage);
+            }
+            else
+            {
+                VersionController.Instance.PackageVersion = LauncherConfig.manifest_v;
+            }
             yield return UpdateManifest(DefaultPackage);
 
             CreateDownloader(DefaultPackage);