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

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

@@ -3,6 +3,7 @@ using System.Text.RegularExpressions;
 using ET;
 using UnityEngine;
 using FairyGUI;
+using System;
 
 namespace GFGGame
 {
@@ -68,6 +69,7 @@ namespace GFGGame
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
                 //_ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
                 _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");
+                _ui.m_loaIcon.onClick.Add(OnBtnIconClick);
 
             }
         }
@@ -145,5 +147,13 @@ namespace GFGGame
             }
         }
 
+        private void OnBtnIconClick(EventContext context)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
+            object[] sourceDatas = new object[]
+                { itemCfg.id, new object[] { typeof(ChangeNameView).FullName, this.viewData } };
+            GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+        }
+
     }
 }

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

@@ -89,6 +89,20 @@ namespace GFGGame
             if (selectPictureId == _showPictureId)//删除：点击相同id照片
             {
                 RoleDataManager.photoDatas[_showIndex] = 0;
+
+                // 将空位移动到后面
+                for (int i = _showIndex; i < RoleDataManager.photoDatas.Count - 1; i++)
+                {
+                    if (RoleDataManager.photoDatas[i + 1] == 0)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        RoleDataManager.photoDatas[i] = RoleDataManager.photoDatas[i + 1];
+                        RoleDataManager.photoDatas[i + 1] = 0;
+                    }
+                }
             }
             else
             {
@@ -96,7 +110,15 @@ namespace GFGGame
                 {
                     if (RoleDataManager.photoDatas.IndexOf(selectPictureId) < 0)//选中的图片未被选中
                     {
-                        RoleDataManager.photoDatas[_showIndex] = selectPictureId;
+                        // 找到第一个空位
+                        for(int i = 0; i < RoleDataManager.photoDatas.Count; i++)
+                        {
+                            if(RoleDataManager.photoDatas[i] == 0)
+                            {
+                                RoleDataManager.photoDatas[i] = selectPictureId;
+                                break;
+                            }
+                        }
                     }
                 }
                 else//原来有展示图片

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

@@ -38,8 +38,8 @@ namespace GFGGame
             _ui.m_loaChangeName.onClick.Add(OnClickLoaChangeName);
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_btnSuitGuide.target.onClick.Add(OnBtnFieldGuideClick);
-            _ui.m_btnCardGuide.target.onClick.Add(OnBtnFieldGuideClick);
+            _ui.m_btnSuitGuide.target.onClick.Add(OnBtnSuitGuideClick);
+            _ui.m_btnCardGuide.target.onClick.Add(OnBtnCardGuideClick);
             _ui.m_btnTaskArchieveGuide.target.onClick.Add(OnBtnTaskArchieveClick);
 
             _ui.m_btnSkill.onClick.Add(OnBtnSkillClick);
@@ -216,9 +216,22 @@ namespace GFGGame
             ViewManager.Show<ChangeNameView>();
         }
 
-        private void OnBtnFieldGuideClick()
+        private void OnBtnSuitGuideClick()
         {
-            ViewManager.Show<FieldGuideView>();
+            ViewManager.Show<SuitGuideView>();
+        }
+
+        private void OnBtnCardGuideClick()
+        {
+            bool open = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            if (open)
+            {
+                ViewManager.Show<CardGuideView>();
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("此功能未开启~");
+            }
         }
 
         private void OnBtnTaskArchieveClick()

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

@@ -187,25 +187,23 @@ namespace GFGGame
             //string hostServerIP = "http://10.108.64.127";
             string hostServerIP = LauncherConfig.CDN_ROOT;
 
+            string platform = "PC";
 #if UNITY_EDITOR
             if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.Android)
-                return $"{hostServerIP}/Android/{packageName}";
+                platform = "Android";
             else if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.iOS)
-                return $"{hostServerIP}/IPhone/{packageName}";
+                platform = "IOS";
             else if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.WebGL)
-                return $"{hostServerIP}/WebGL/{packageName}";
-            else
-                return $"{hostServerIP}/PC/{packageName}";
+                platform = "WebGL";
 #else
 		if (Application.platform == RuntimePlatform.Android)
-			return $"{hostServerIP}/Android/{packageName}";
+                platform = "Android";
 		else if (Application.platform == RuntimePlatform.IPhonePlayer)
-			return $"{hostServerIP}/IOS/{packageName}";
+                platform = "IOS";
 		else if (Application.platform == RuntimePlatform.WebGLPlayer)
-			return $"{hostServerIP}/WebGL/{packageName}";
-		else
-			return $"{hostServerIP}/PC/{packageName}";
+                platform = "WebGL";
 #endif
+            return $"{hostServerIP}/{platform}/{packageName}/HostPlay";
         }
         /// <summary>
         /// 远端资源地址查询服务类

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.0
+  bundleVersion: 2.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0