Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -396,8 +396,7 @@ namespace GFGGame
                 arenaTarget.RoleInfo.roleId = 0;
                 arenaTarget.RoleInfo.roleName = arenaTargetProto.RobotDressupInfo.Name;
                 arenaTarget.RoleInfo.roleLv = robotCfg.level;
-                //由于现在机器人头像就一个，所以这么改
-                arenaTarget.RoleInfo.headRes = robotCfg.targetResArr[0]; //string.IsNullOrEmpty(arenaTargetProto.RobotDressupInfo.RobotHead) ? "self" : arenaTargetProto.RobotDressupInfo.RobotHead;
+                arenaTarget.RoleInfo.headRes = string.IsNullOrEmpty(arenaTargetProto.RobotDressupInfo.RobotHead) ? "self" : arenaTargetProto.RobotDressupInfo.RobotHead;
             }
 
             arenaTarget.FightDatas.Clear();

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -110,7 +110,9 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(typeof(ArenaDressInfoView).FullName); //返回竞技场主界面
+            //ViewManager.GoBackFrom(typeof(ArenaDressInfoView).FullName); //返回竞技场主界面
+            this.OnHide();
+            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
             if (!string.IsNullOrEmpty(_openViewName))
             {
                 ViewManager.Show(_openViewName); //打开来源界面：如历史记录、排行榜

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -149,7 +149,9 @@ namespace GFGGame
         {
             GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 12);
             GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 12);
-            ViewManager.GoBackFrom(typeof(ArenaView).FullName);
+            //ViewManager.GoBackFrom(typeof(ArenaView).FullName);
+            this.OnHide();
+            ViewManager.Show<InstanceZonesUIView>();
         }
         private void OnBtnShopClick()
         {
@@ -410,6 +412,11 @@ namespace GFGGame
                 item.m_challengeBtn.onClick.Add(OnSelectRoleClick);
             }
             item.m_challengeBtn.data = index;
+            if (item.m_loaBg.data == null)
+            {
+                item.m_loaBg.onClick.Add(OnSelectRoleClick);
+            }
+            item.m_loaBg.data = index;
             if (item.m_btnLook.data == null)
             {
                 item.m_btnLook.onClick.Add(OnBtnLookClick);

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -209,7 +209,8 @@ namespace GFGGame
             _roleData.itemList = _itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
-            ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+            //ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
         }
         private void OnBtnFightScoreRule()
         {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpConfigUtil.cs

@@ -1,68 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using UnityEngine;
-using static GFGGame.ConfigUtil;
-
-namespace GFGGame
-{
-    public class DressUpConfigUtil
-    {
-        private static int loadCount;
-
-        public static int LoadCount { get => loadCount; set => loadCount = value; }
-
-        //多列值查询多个数据
-        public static async Task GetCfgsAsync<T>(string tableName, string[] colNames, string[] colValues, Dictionary<string, List<T>> cfgsDic, HandleCfgInGroupAction<T> action = null) where T : ICfg, new()
-        {
-            string key = string.Join("_", colValues);
-            List<T> cfgs = null;
-            if (cfgsDic != null && cfgsDic.ContainsKey(key))
-            {
-                cfgs = cfgsDic[key];
-                return;
-            }
-            cfgs = new List<T>();
-            SQLiteHelper.Instance.OpenConnection();
-            int count = 0;
-            try
-            {
-                var reader = SQLiteHelper.Instance.ReadTable(tableName, colNames, colValues);
-                while (reader.Read())
-                {
-                    var cfg = new T();
-                    cfg.setData(reader);
-                    cfgs.Add(cfg);
-                    action?.Invoke(cfg);
-                    ItemCfg itemCfg = cfg as ItemCfg;
-                    if (itemCfg.isHide != 0)
-                    {
-                        continue;
-                    }
-                    ++count;
-                    ++LoadCount;
-                    if (count == 5)
-                    {
-                        count = 0;
-                        await Task.Delay(1);
-                    }
-                }
-                if (cfgsDic != null)
-                {
-                    cfgsDic.Add(key, cfgs);
-                }
-            }
-            catch (System.Exception e)
-            {
-                ET.Log.Error(e);
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
-
-
-        }
-
-    }
-}

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpConfigUtil.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ddbf811fca3f4f445a38bdbd2a51cf89
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -253,7 +253,8 @@ namespace GFGGame
                     MyDressUpHelper.dressUpObj.itemList).Coroutine();
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
-                    ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+                    //ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
                 }
             }
             else

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -4,6 +4,7 @@ using UI.Main;
 using System.Collections.Generic;
 using UnityEngine;
 using System.Collections;
+using ET;
 
 namespace GFGGame
 {
@@ -194,7 +195,16 @@ namespace GFGGame
             }
             else
             {
-                PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
+                StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID + 1);
+                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < chapterCfg.lvl)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到%d级开启",chapterCfg.lvl));
+                }
+                else
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
+                }
+                
             }
         }