雅集

GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -15,6 +15,7 @@
 
             GiftBagScanner.StartScan();
             FieldScanner.StartScan();
+            LeagueScanner.StartScan();
             // SuitGuideScanner.StartScan();
         }
     }

GameClient/Assets/Editor/Excel/Scanner/LeagueScanner.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GFGGame;
+using UnityEngine;
+
+namespace GFGEditor
+{
+    public class LeagueScanner
+    {
+        private static Dictionary<int, int> skilCountDic = new Dictionary<int, int>();
+        private static Dictionary<int, int> layerCountDic = new Dictionary<int, int>();
+
+        public static void StartScan()
+        {
+            skilCountDic.Clear();
+            layerCountDic.Clear();
+
+            int typeValue = 1;
+            List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytype(typeValue);
+            while (skillCfgs != null && skillCfgs.Count > 0)
+            {
+                skilCountDic[typeValue] = skillCfgs.Count;
+                layerCountDic[typeValue] = 0;
+
+                int layer = 1;
+                List<LeagueSkillCfg> skillLayerCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(typeValue, layer);
+
+                while (skillLayerCfgs != null && skillLayerCfgs.Count > 0)
+                {
+                    layerCountDic[typeValue] = layer;
+                    layer++;
+                    skillLayerCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(typeValue, layer);
+                }
+                typeValue++;
+                skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytype(typeValue);
+            }
+
+
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                ICollection<int> keys = layerCountDic.Keys;
+                foreach (int key in skilCountDic.Keys)
+                {
+                    string type = key.ToString();
+                    string layerCount = layerCountDic[key].ToString();
+                    string skillCount = skilCountDic[key].ToString();
+
+                    var values = new string[] { type, layerCount, skillCount };
+                    // SQLiteHelper.Instance.UpdateValues(nameof(LeagueSkillCountCfgArray), names, values, "type", key.ToString());
+                    SQLiteHelper.Instance.InsertValues(nameof(LeagueSkillCountCfgArray), values);
+                }
+            }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+
+        }
+
+    }
+}

GameClient/Assets/Editor/Excel/Scanner/LeagueScanner.cs.meta

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

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -101,7 +101,7 @@ namespace GFGGame
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("CommonGame"));
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("Main"));
 
-            // LeagueSproxy.ReqGetLeagueInfo().Coroutine();
+            LeagueSproxy.ReqGetLeagueInfo().Coroutine();
             await ItemProxy.GetItemInfos();
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();

GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -298,7 +298,7 @@ namespace GFGGame
         public void SetMineFightAttr(FightData fightData, int theme)
         {
             fightData.cardScore = ItemDataManager.GetItemAdditionScore(fightData.cardId, theme, fightData.tags);
-            fightData.skillLvs = SkillDataManager.Instance.GetSkillLvs(fightData.cardId);
+            fightData.skillLvs = SkillDataManager.Instance.GetCardSkillLvs(fightData.cardId);
             FightDataManager.Instance.SetItemScoreList(fightData);
         }
         /// <summary>

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -228,7 +228,7 @@ namespace GFGGame
             List<CardData> arrayList = new List<CardData>(cardList);
             for (int i = arrayList.Count - 1; i >= 0; i--)
             {
-                List<int> skillLvs = SkillDataManager.Instance.GetSkillLvs(arrayList[i].id);
+                List<int> skillLvs = SkillDataManager.Instance.GetCardSkillLvs(arrayList[i].id);
                 if (skillLvs.Count == 0)
                 {
                     ET.Log.Error("卡牌：" + arrayList[i].id + " 未配置技能");
@@ -238,8 +238,8 @@ namespace GFGGame
             int baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
             arrayList.Sort((CardData a, CardData b) =>
             {
-                double scoreA = GetSkillFightScore(itemSum, baseScore, a.id, a.scores[scoreType], SkillDataManager.Instance.GetSkillLvs(a.id));
-                double scoreB = GetSkillFightScore(itemSum, baseScore, b.id, b.scores[scoreType], SkillDataManager.Instance.GetSkillLvs(b.id));
+                double scoreA = GetSkillFightScore(itemSum, baseScore, a.id, a.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(a.id));
+                double scoreB = GetSkillFightScore(itemSum, baseScore, b.id, b.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(b.id));
                 if (scoreA < scoreB)
                 {
                     return 1;

GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs

@@ -98,7 +98,7 @@ namespace GFGGame
 
             if (_roleData.cardId > 0)
             {
-                _roleData.skillLvs = SkillDataManager.Instance.GetSkillLvs(_roleData.cardId);
+                _roleData.skillLvs = SkillDataManager.Instance.GetCardSkillLvs(_roleData.cardId);
             }
             _roleData.type = FightTargetType.PLAYER;
 

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -121,7 +121,7 @@ namespace GFGGame
             int leagueType = NumericUtil.GetLeagueNumericTypeByItemId(itemId);
             if (leagueType != 0)
             {
-                return LeagueDataManager.Instance.GetNumericValue(LeagueDataManager.Instance.LeagueData, leagueType);
+                return LeagueDataManager.Instance.GetNumeriValue(leagueType);
             }
             if (_dataDic.TryGetValue(itemId, out var itemData))
             {

GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -6,9 +6,14 @@ namespace GFGGame
     {
         public int Type = 2;// 1:已经加入军团 2:未加入军团
         public LeagueData LeagueData;//联盟信息
+        public int HallLevel { get { return (int)GetNumeriValue(LeagueNumericType.HallLevel); } }
+        public int HotelLevel { get { return (int)GetNumeriValue(LeagueNumericType.HotelLevel); } }
+        public int StoreLevel { get { return (int)GetNumeriValue(LeagueNumericType.StoreLevel); } }
+        public Dictionary<int, long> LeagueNumber = new Dictionary<int, long>();//联盟数值
         public Dictionary<long, LeagueListData> ListDatas = new Dictionary<long, LeagueListData>();//联盟列表
         public Dictionary<long, OtherRoleInfoData> ListApplyDatas = new Dictionary<long, OtherRoleInfoData>();//联盟申请列表
         public List<LeagueLogData> ListLogDatas = new List<LeagueLogData>();//日志数据
+        public Dictionary<long, int> ListAnswerDatas = new Dictionary<long, int>();//答题数据
 
 
         public void Clear()
@@ -19,55 +24,21 @@ namespace GFGGame
             ListApplyDatas.Clear();
             ListLogDatas.Clear();
         }
-        public void UpdateNumeric(LeagueData LeagueData, int type, long value)
+        public void SetNumeric(int type, long value)
         {
-
-            switch (type)
-            {
-                case LeagueNumericType.HallLevel:
-                    LeagueData.HallLevel = (int)value;
-                    break;
-                case LeagueNumericType.HotelLevel:
-                    LeagueData.HotelLevel = (int)value;
-                    break;
-                case LeagueNumericType.StoreLevel:
-                    LeagueData.StoreLevel = (int)value;
-                    break;
-                case LeagueNumericType.LowKeepDay:
-                    LeagueData.LowKeepDay = value;
-                    break;
-                case LeagueNumericType.LeagueCoin:
-                    LeagueData.LeagueCoin = value;
-                    break;
-                case LeagueNumericType.DayAdd:
-                    LeagueData.DayAdd = value;
-                    break;
-                case LeagueNumericType.NeedAudit:
-                    LeagueData.NeedAudit = value == 0 ? false : true; //0不用 1需要
-                    break;
-            }
+            LeagueNumber[type] = value;
         }
-        public long GetNumericValue(LeagueData LeagueData, int type)
+
+        public long GetNumeriValue(int type)
         {
-            switch (type)
+            if (LeagueNumber.TryGetValue(type, out long value))
             {
-                case LeagueNumericType.HallLevel:
-                    return LeagueData.HallLevel;
-                case LeagueNumericType.HotelLevel:
-                    return LeagueData.HotelLevel;
-                case LeagueNumericType.StoreLevel:
-                    return LeagueData.StoreLevel;
-                case LeagueNumericType.LowKeepDay:
-                    return LeagueData.LowKeepDay;
-                case LeagueNumericType.LeagueCoin:
-                    return LeagueData.LeagueCoin;
-                case LeagueNumericType.DayAdd:
-                    return LeagueData.DayAdd;
-                default:
-                    return 0;
+                return value;
             }
+            return 0;
         }
 
+
         public string GetMemberTitle(int pos)
         {
             string title = "";

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -254,7 +254,7 @@ namespace GFGGame
         {
 
             PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfg(skillId);
-            int skillLv = SkillDataManager.Instance.GetSkillLv(skillCfg.cardId, skillId);
+            int skillLv = SkillDataManager.Instance.GetCardSkillLv(skillCfg.cardId, skillId);
 
             PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
             PassivitySkillLvlCfg nextSkillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillId);

GameClient/Assets/Game/HotUpdate/Data/SkillDataManager.cs

@@ -5,72 +5,51 @@ namespace GFGGame
 {
     public class SkillDataManager : SingletonBase<SkillDataManager>
     {
-        public const int MINE = 0;
-        public const int NPC = 1;
-        public const string SKILL_ADD = "add";
-        public const string SKILL_MINUS = "minus";
-        public const string SKILL_BREAK = "break";
-        public const string SKILL_SHIELD = "shield";
-
-        public Dictionary<int, Dictionary<int, int>> skillData = new Dictionary<int, Dictionary<int, int>>();
+        public Dictionary<int, Dictionary<int, int>> CardSkillData = new Dictionary<int, Dictionary<int, int>>();
 
         public void Clear()
         {
-            skillData.Clear();
+            CardSkillData.Clear();
         }
-        public void InitServerData(int cardId, List<int> skillIds, List<int> skillLvs)
+        /*********************************************************卡牌技能****************************************************/
+        public void InitCardData(int cardId, List<int> skillIds, List<int> skillLvs)
         {
 
-
-            if (!this.skillData.ContainsKey(cardId))
+            if (!this.CardSkillData.ContainsKey(cardId))
             {
-                this.skillData[cardId] = new Dictionary<int, int>();
+                this.CardSkillData[cardId] = new Dictionary<int, int>();
             }
             for (int i = 0; i < skillIds.Count; i++)
             {
-                UpdateSkill(cardId, skillIds[i], skillLvs[i]);
+                UpdateCardSkill(cardId, skillIds[i], skillLvs[i]);
             }
         }
-        public void UpdateSkill(int cardId, int skillId, int skillLv)
+        public void UpdateCardSkill(int cardId, int skillId, int skillLv)
         {
-            this.skillData[cardId][skillId] = skillLv;
+            this.CardSkillData[cardId][skillId] = skillLv;
         }
 
-        // //获取npc释放技能顺序
-        // public Dictionary<int, RoleSkillCfg> GetNpcSkill()
-        // {
-        //     Dictionary<int, RoleSkillCfg> npcSkillDic = new Dictionary<int, RoleSkillCfg>();
-        //     RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
-        //     List<int> arr = new List<int> { 0, 1, 2, 3, 4, 5, 6, 7 };
-        //     for (int i = 0; i < roleSkillCfgs.Length; i++)
-        //     {
-        //         int partIndex = Random.Range(0, arr.Count);
-        //         npcSkillDic.Add(arr[partIndex], roleSkillCfgs[i]);
-        //         arr.RemoveAt(partIndex);
-        //     }
-        //     return npcSkillDic;
-        // }
-
-        public int GetSkillLv(int cardId, int skillId)
+        public int GetCardSkillLv(int cardId, int skillId)
         {
             int lv = 1;
-            if (this.skillData.ContainsKey(cardId) && this.skillData[cardId].ContainsKey(skillId))
+            if (this.CardSkillData.ContainsKey(cardId) && this.CardSkillData[cardId].ContainsKey(skillId))
             {
-                lv = this.skillData[cardId][skillId];
+                lv = this.CardSkillData[cardId][skillId];
             }
             return lv;
         }
-        public List<int> GetSkillLvs(int cardId)
+        public List<int> GetCardSkillLvs(int cardId)
         {
             List<int> skillLvs = new List<int>();
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
 
             for (int i = 0; i < skillCfgs.Count; i++)
             {
-                skillLvs.Add(GetSkillLv(cardId, skillCfgs[i].skillId));
+                skillLvs.Add(GetCardSkillLv(cardId, skillCfgs[i].skillId));
             }
             return skillLvs;
         }
+        /*************************************************************************************************************/
 
     }
 }

GameClient/Assets/Game/HotUpdate/Data/VO/LeagueData.cs

@@ -10,14 +10,6 @@ namespace GFGGame
         public string Notice;//联盟公告
         public int Num;//联盟人数
         public int FlowerNum;//联盟会花人数
-        public long AdEndTime;//广告结束时间
-        public int HallLevel { get; set; } //会客厅等级 影响 小酒馆等级上限，小金库等级上限，
-        public int HotelLevel { get; set; } //小酒馆等级 影响 人数上限 会花上限 每日新加入联盟成员上限 招募额外增加的成员上限，
-        public int StoreLevel { get; set; } //金库等级 影响 联盟资金储存上限
-        public long LowKeepDay { get; set; } //低维护天数
-        public long LeagueCoin { get; set; } //联盟资金
-        public long DayAdd { get; set; } //新加入联盟成员人数
-        public bool NeedAudit { get; set; } //是否需要审核
         public long OwnerId = 0;
         public long SubOwnerId = 0;
         public Dictionary<long, LeagueMemberData> LeagueMemberDatas = new Dictionary<long, LeagueMemberData>();//联盟成员

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Unit/UnitFactory.cs

@@ -17,6 +17,7 @@ namespace ET
             {
                 numericComponent.Set(unitInfo.Ks[i], unitInfo.Vs[i]);
             }
+
             //角色信息
             RoleDataManager.InitServerData();
             return unit;

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

@@ -9,7 +9,7 @@ namespace ET
         protected override async ETTask Run(Session session, M2C_GetNewCard message)
         {
             CardDataManager.Add(message.CardInfo);
-            SkillDataManager.Instance.InitServerData(message.CardInfo.CardId, message.CardInfo.KsSkill, message.CardInfo.VsSkill);
+            SkillDataManager.Instance.InitCardData(message.CardInfo.CardId, message.CardInfo.KsSkill, message.CardInfo.VsSkill);
             await ETTask.CompletedTask;
         }
     }
@@ -29,7 +29,7 @@ namespace GFGGame
                     for (int i = 0; i < response.CardInfos.Count; i++)
                     {
                         CardDataManager.Add(response.CardInfos[i]);
-                        SkillDataManager.Instance.InitServerData(response.CardInfos[i].CardId, response.CardInfos[i].KsSkill, response.CardInfos[i].VsSkill);
+                        SkillDataManager.Instance.InitCardData(response.CardInfos[i].CardId, response.CardInfos[i].KsSkill, response.CardInfos[i].VsSkill);
                     }
                     EventAgent.DispatchEvent(ConstMessage.CARD_INFO);
                 }
@@ -95,21 +95,7 @@ namespace GFGGame
             }
             return false;
         }
-        public static async ETTask<bool> UpgradeCardSkill(int cardId, int skillId)
-        {
-            M2C_UpgradeCardSkill response = null;
-            response = (M2C_UpgradeCardSkill)await MessageHelper.SendToServer(new C2M_UpgradeCardSkill() { CardId = cardId, SkillId = skillId });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    SkillDataManager.Instance.UpdateSkill(response.CardId, response.SkillId, response.SkillLvl);
-                    EventAgent.DispatchEvent(ConstMessage.CARD_UP_SKILL);
-                    return true;
-                }
-            }
-            return false;
-        }
+
 
         public static async ETTask<bool> GetCardStarBonus(int cardId, int starLv)
         {

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

@@ -30,7 +30,7 @@ namespace GFGGame
         {
             if (message.LeagueId == LeagueDataManager.Instance.LeagueData.LeagueId)
             {
-                LeagueDataManager.Instance.UpdateNumeric(LeagueDataManager.Instance.LeagueData, message.NumericType, message.NewValue);
+                LeagueDataManager.Instance.SetNumeric(message.NumericType, message.NewValue);
                 EventAgent.DispatchEvent(ConstMessage.LEAGUE_NUMBERIC_CHANGE);
             }
             await ETTask.CompletedTask;
@@ -205,6 +205,44 @@ namespace GFGGame
     }
 
 
+    //通知有玩家加入答题
+    public class NoticeNoticeJoinAnswer : AMHandler<L2C_NoticeJoinAnswer>
+    {
+        protected override async ETTask Run(Session session, L2C_NoticeJoinAnswer message)
+        {
+
+            await ETTask.CompletedTask;
+        }
+    }
+    //同步玩家答题数量
+    public class NoticeAnswerNum : AMHandler<S2C_SyncAnswerNum>
+    {
+        protected override async ETTask Run(Session session, S2C_SyncAnswerNum message)
+        {
+
+            await ETTask.CompletedTask;
+        }
+    }
+    //同步答题开始
+    public class NoticeAnswerStart : AMHandler<S2C_SyncAnswerStart>
+    {
+        protected override async ETTask Run(Session session, S2C_SyncAnswerStart message)
+        {
+
+            await ETTask.CompletedTask;
+        }
+    }
+    //通知答题暂停
+    public class NoticeAnswerPause : AMHandler<L2C_NoticeAnswerPause>
+    {
+        protected override async ETTask Run(Session session, L2C_NoticeAnswerPause message)
+        {
+
+            await ETTask.CompletedTask;
+        }
+    }
+    /*****************************************************************************************************************************************/
+
     public static class LeagueSproxy
     {
         //获取联盟信息
@@ -327,7 +365,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    LeagueDataManager.Instance.LeagueData.NeedAudit = response.IsNeed;
+                    LeagueDataManager.Instance.SetNumeric(LeagueNumericType.NeedAudit, response.IsNeed ? 1 : 0);
                     return true;
                 }
             }
@@ -406,14 +444,6 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    // if (type == 1)
-                    // {
-                    //     LeagueDataManager.Instance.LeagueData.Name = changed;
-                    // }
-                    // else
-                    // {
-                    //     LeagueDataManager.Instance.LeagueData.Icon = changed;
-                    // }
                     PromptController.Instance.ShowFloatTextPrompt("修改成功");
                     return true;
                 }
@@ -444,7 +474,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    LeagueDataManager.Instance.LeagueData.AdEndTime = response.AdEndTime;
+                    LeagueDataManager.Instance.SetNumeric(LeagueNumericType.AdEndTime, response.AdEndTime);
                     return true;
                 }
             }
@@ -501,21 +531,129 @@ namespace GFGGame
             }
             return false;
         }
+        //购买联盟福利//LeagueWelfareType
+        public static async ETTask<bool> ReqBuyLeagueWelfare(int type)
+        {
+            S2C_BuyLeagueWelfare response = null;
+            response = (S2C_BuyLeagueWelfare)await MessageHelper.SendToServer(new C2S_BuyLeagueWelfare() { Type = type });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取联盟福利//LeagueWelfareType
+        public static async ETTask<bool> ReqGetLeagueWelfare(int type)
+        {
+            S2C_GetLeagueWelfare response = null;
+            response = (S2C_GetLeagueWelfare)await MessageHelper.SendToServer(new C2S_GetLeagueWelfare() { Type = type });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
+        //加入答题
+        public static async ETTask<bool> ReqJoinAnswer()
+        {
+            S2C_JoinAnswer response = null;
+            response = (S2C_JoinAnswer)await MessageHelper.SendToServer(new C2S_JoinAnswer() { RoleId = RoleDataManager.roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
+        //退出答题
+        public static async ETTask<bool> ReqQuitAnswer()
+        {
+            S2C_QuitAnswer response = null;
+            response = (S2C_QuitAnswer)await MessageHelper.SendToServer(new C2S_QuitAnswer() { RoleId = RoleDataManager.roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //获取技能列表
+        public static async ETTask<bool> ReqGetSkillList(int sKillType)
+        {
+            S2C_GetSkillList response = null;
+            response = (S2C_GetSkillList)await MessageHelper.SendToServer(new C2S_GetSkillList() { SKillType = sKillType });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
+        //激活技能
+        public static async ETTask<bool> ReqActiveSkill(int sKillType, int SkillId)
+        {
+            S2C_GetSkillList response = null;
+            response = (S2C_GetSkillList)await MessageHelper.SendToServer(new C2S_GetSkillList() { SKillType = sKillType });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
 
 
+        //发送聊天消息
+        public static async ETTask<bool> ReqSendChatMsg()
+        {
+            S2C_SendChatMsg response = null;
+            response = (S2C_SendChatMsg)await MessageHelper.SendToServer(new C2S_SendChatMsg() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
+                }
+            }
+            return false;
+        }
+
         private static LeagueData GetLeagueData(LeagueDetailInfoProto leagueDetailInfo)
         {
-            LeagueData leagueData = new LeagueData();
+            LeagueData leagueData = LeagueDataManager.Instance.LeagueData == null ? new LeagueData() : LeagueDataManager.Instance.LeagueData;
             leagueData.LeagueId = leagueDetailInfo.LeagueId;
             leagueData.Name = leagueDetailInfo.Name;
             leagueData.Icon = leagueDetailInfo.Icon;
             leagueData.Notice = leagueDetailInfo.Notice;
             leagueData.Num = leagueDetailInfo.Num;
             leagueData.FlowerNum = 0;
-            leagueData.AdEndTime = leagueDetailInfo.AdEndTime;
             leagueData.OwnerId = leagueDetailInfo.OwnerId;
             leagueData.SubOwnerId = leagueDetailInfo.SubOwnerId;
 
+            LeagueDataManager.Instance.SetNumeric(LeagueNumericType.AdEndTime, leagueDetailInfo.AdEndTime);
+
             leagueData.LeagueMemberDatas.Clear();
             for (int i = 0; i < leagueDetailInfo.LeagueMemberDetailInfo.Count; i++)
             {
@@ -525,7 +663,7 @@ namespace GFGGame
             }
             for (int i = 0; i < leagueDetailInfo.NumberKeys.Count; i++)
             {
-                LeagueDataManager.Instance.UpdateNumeric(leagueData, leagueDetailInfo.NumberKeys[i], leagueDetailInfo.Values[i]);
+                LeagueDataManager.Instance.SetNumeric(leagueDetailInfo.NumberKeys[i], leagueDetailInfo.Values[i]);
             }
             return leagueData;
         }

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

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+namespace ET
+{
+
+}
+namespace GFGGame
+{
+    public static class SkillSProxy
+    {
+        public static async ETTask<bool> ReqUpgradeCardSkill(int cardId, int skillId)
+        {
+            M2C_UpgradeCardSkill response = null;
+            response = (M2C_UpgradeCardSkill)await MessageHelper.SendToServer(new C2M_UpgradeCardSkill() { CardId = cardId, SkillId = skillId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    SkillDataManager.Instance.UpdateCardSkill(response.CardId, response.SkillId, response.SkillLvl);
+                    EventAgent.DispatchEvent(ConstMessage.CARD_UP_SKILL);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/SkillSProxy.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -740,7 +740,7 @@ namespace GFGGame
 
             PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id)[index];
 
-            int skillLv = SkillDataManager.Instance.GetSkillLv(_cardData.id, skillCfg.skillId);
+            int skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardData.id, skillCfg.skillId);
             CardData data = CardDataManager.GetCardDataById(InstanceZonesDataManager.currentCardId);
             item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(_cardData.resources[_cardData.resIndex]);
             item.m_txtName.text = skillCfg.name;

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -50,7 +50,7 @@ namespace GFGGame
 
             _cardId = (int)(viewData as object[])[0];
             _skillId = (int)(viewData as object[])[1];
-            _skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
+            _skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardId, _skillId);
 
             // SkillData skillData = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             skillCfg = PassivitySkillCfgArray.Instance.GetCfg(_skillId);// SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId);
@@ -64,10 +64,10 @@ namespace GFGGame
         private void UpdateView()
         {
             _ui.m_c1.selectedIndex = 0;
-            _skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
+            _skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardId, _skillId);
             skillCfg = PassivitySkillCfgArray.Instance.GetCfg(_skillId);// SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId);
             skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(_skillLv, _skillId);
-            int skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
+            int skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardId, _skillId);
             UpdateComLv(_ui.m_comCurLV, skillLv, skillLv + "级");
 
             if (PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, _skillId) == null) //已满级
@@ -148,7 +148,7 @@ namespace GFGGame
             }
             if (!isEnough) return;
 
-            bool result = await CardSProxy.UpgradeCardSkill(_cardId, _skillId);
+            bool result = await SkillSProxy.ReqUpgradeCardSkill(_cardId, _skillId);
             if (result)
             {
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueApplyView.cs

@@ -47,7 +47,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_btnNoCheck.selected = !LeagueDataManager.Instance.LeagueData.NeedAudit;
+            _ui.m_btnNoCheck.selected = LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.NeedAudit) == 0;//LeagueDataManager.Instance.LeagueData.NeedAudit;
             UpdateView();
         }
 
@@ -98,7 +98,7 @@ namespace GFGGame
         private async void OnBtnAgreeClick(EventContext context)
         {
             long roleId = (long)(context.sender as GObject).data;
-            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg((int)LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.HotelLevel));
             if (LeagueDataManager.Instance.LeagueData.Num >= hotelCfg.limit)
             {
                 PromptController.Instance.ShowFloatTextPrompt("雅集满员啦");

GameClient/Assets/Game/HotUpdate/Views/League/LeagueConstructView.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     public class LeagueConstructView : BaseWindow
     {
         private UI_LeagueConstructUI _ui;
+        private LeagueDataManager _leagueDataManager;
 
         public override void Dispose()
         {
@@ -42,6 +43,8 @@ namespace GFGGame
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+
+            _leagueDataManager = LeagueDataManager.Instance;
         }
         protected override void AddEventListener()
         {
@@ -78,7 +81,7 @@ namespace GFGGame
         private void OnBtnUpLvClick(EventContext context)
         {
             int type = (int)(context.sender as GObject).data;
-            int myPos = LeagueDataManager.Instance.GetMyPos();
+            int myPos = _leagueDataManager.GetMyPos();
             if (myPos != LeaguePos.Owner && myPos != LeaguePos.SubOwner)
             {
                 PromptController.Instance.ShowFloatTextPrompt("权限不足");
@@ -88,19 +91,19 @@ namespace GFGGame
             long hasCount = 0;
             if (type == LeagueBuildingType.Hall)
             {
-                LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HallLevel);
-                needCount = hallCfg.consumeArr[0][1];
-                hasCount = ItemDataManager.GetItemNum(hallCfg.consumeArr[0][0]);
+                LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(_leagueDataManager.HallLevel);
+                needCount = hallCfg.consumeUpArr[0][1];
+                hasCount = ItemDataManager.GetItemNum(hallCfg.consumeUpArr[0][0]);
             }
             else if (type == LeagueBuildingType.Hotel)
             {
-                LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
+                LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(_leagueDataManager.HotelLevel);
                 needCount = hotelCfg.consumeArr[0][1];
                 hasCount = ItemDataManager.GetItemNum(hotelCfg.consumeArr[0][0]);
             }
             else if (type == LeagueBuildingType.Store)
             {
-                LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.StoreLevel);
+                LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(_leagueDataManager.StoreLevel);
                 needCount = storeCfg.consumeArr[0][1];
                 hasCount = ItemDataManager.GetItemNum(storeCfg.consumeArr[0][0]);
             }
@@ -119,21 +122,23 @@ namespace GFGGame
         }
         private void UpdateHall()
         {
-            int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+            int hallLv = (int)_leagueDataManager.GetNumeriValue(LeagueNumericType.HallLevel);
+            int hotelLevel = (int)_leagueDataManager.GetNumeriValue(LeagueNumericType.HotelLevel);
+            int storeLevel = (int)_leagueDataManager.GetNumeriValue(LeagueNumericType.StoreLevel);
 
             LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
             LeagueHallCfg nextHallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv + 1);
 
-            // ItemUtil.UpdateItemNeedNum(_ui.m_comCost,ConstItemID.LEAGUE_COIN,hallCfg.consumeArr)
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCost, ConstItemID.LEAGUE_COIN, hallCfg.consume);
             _ui.m_txtLv0.text = hallLv.ToString();
 
-            int hotelLv = LeagueDataManager.Instance.LeagueData.HotelLevel;
+            int hotelLv = hotelLevel;
             int hotelAdd = nextHallCfg == null ? 0 : nextHallCfg.levelHotel - hotelLv;
             _ui.m_comHall0.m_txtCurValue.text = hotelLv.ToString();
             _ui.m_comHall0.m_txtNextAdd.text = hotelAdd.ToString();
             _ui.m_comHall0.m_c1.selectedIndex = hotelAdd > 0 ? 1 : 0;
 
-            int storeLv = LeagueDataManager.Instance.LeagueData.StoreLevel;
+            int storeLv = storeLevel;
             int storeAdd = nextHallCfg == null ? 0 : nextHallCfg.levelStore - storeLv;
             _ui.m_comHall1.m_txtCurValue.text = storeLv.ToString();
             _ui.m_comHall1.m_txtNextAdd.text = storeAdd.ToString();
@@ -142,17 +147,19 @@ namespace GFGGame
             _ui.m_btnUpLv0.target.enabled = nextHallCfg == null ? false : true;
             _ui.m_btnUpLv0.m_txtTip.text = nextHallCfg == null ? "已满级" : "";
             _ui.m_btnUpLv0.m_comCost.visible = nextHallCfg == null ? false : true;
-            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv0.m_comCost, hallCfg.consumeArr[0][0], hallCfg.consumeArr[0][1]);
+            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv0.m_comCost, hallCfg.consumeUpArr[0][0], hallCfg.consumeUpArr[0][1]);
 
 
         }
 
         private void UpdateHotel()
         {
-            int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+            int hallLv = _leagueDataManager.HallLevel;
+            int hotelLv = _leagueDataManager.HotelLevel;
+
+            // int hallLv = _leagueDataManager.LeagueData.HallLevel;
             LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
 
-            int hotelLv = LeagueDataManager.Instance.LeagueData.HotelLevel;
             LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv);
             LeagueHotelCfg nextHotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv + 1);
 
@@ -212,10 +219,13 @@ namespace GFGGame
 
         private void UpdateStore()
         {
-            int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+            int hallLv = _leagueDataManager.HallLevel;
+            int storeLv = _leagueDataManager.StoreLevel;
+
+            // int hallLv = _leagueDataManager.LeagueData.HallLevel;
             LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
 
-            int storeLv = LeagueDataManager.Instance.LeagueData.StoreLevel;
+            // int storeLv = _leagueDataManager.LeagueData.StoreLevel;
             LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv);
             LeagueStoreCfg nextStoreCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv + 1);
 

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs

@@ -132,7 +132,7 @@ namespace GFGGame
             _ui.m_btnAppoint1.target.selected = _memberData.Pos == LeaguePos.SubOwner ? true : false;
             _ui.m_btnAppoint1.target.title = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? "0/1" : "1/1";
 
-            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg((int)LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.HotelLevel));
             _ui.m_btnAppoint2.target.touchable = _memberData.Pos == LeaguePos.Flower || LeagueDataManager.Instance.LeagueData.FlowerNum < hotelCfg.limitPosition ? true : false;
             _ui.m_btnAppoint2.m_imgGrey.visible = _memberData.Pos != LeaguePos.Flower && LeagueDataManager.Instance.LeagueData.FlowerNum == hotelCfg.limitPosition ? true : false; ;
             _ui.m_btnAppoint2.target.selected = _memberData.Pos == LeaguePos.Flower ? true : false;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -159,7 +159,7 @@ namespace GFGGame
             ItemUtil.UpdateItemNeedNum(_ui.m_btnRecruit.m_comcost, GlobalCfgArray.globalCfg.consumeWantedArr[0][0], GlobalCfgArray.globalCfg.consumeWantedArr[0][1]);
             int myPos = _leagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos;
             bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
-            long timeCount = (_leagueData.AdEndTime - TimeHelper.ServerNow()) / 1000;
+            long timeCount = (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.AdEndTime) - TimeHelper.ServerNow()) / 1000;
 
             _ui.m_btnRecruit.target.touchable = timeCount <= 0;
             _ui.m_btnRecruit.m_touchable.selectedIndex = timeCount <= 0 ? 1 : 0;
@@ -174,7 +174,7 @@ namespace GFGGame
         }
         private void OnUpdateTimer(object param)
         {
-            int timeCount = (int)(_leagueData.AdEndTime - TimeHelper.ServerNow()) / 1000;
+            int timeCount = (int)(LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.AdEndTime) - TimeHelper.ServerNow()) / 1000;
             if (timeCount <= 0)
             {
                 _ui.m_btnRecruit.target.touchable = true;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -102,20 +102,20 @@ namespace GFGGame
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
             _ui.m_txtUnionName.text = leagueData.Name;
             _ui.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueData.Icon);
-            _ui.m_comLeagueHead.m_txtUnionLv.text = leagueData.HallLevel.ToString();
+            _ui.m_comLeagueHead.m_txtUnionLv.text = LeagueDataManager.Instance.HallLevel.ToString();
             _ui.m_txtNotice.text = leagueData.Notice;
             _ui.m_txtLeaderName.text = leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.roleName;
-            RoleInfoManager.Instance.UpdateHeadWithLv(_ui.m_comHead, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headBorderId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.roleLv);
+            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headBorderId);
         }
         private void UpdateValue()
         {
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
             _ui.m_btnMember.m_txtCount.SetVar("value", leagueData.Num.ToString()).FlushVars();
-            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(leagueData.HotelLevel);
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.HotelLevel);
             _ui.m_btnMember.m_txtCount.SetVar("maxValue", hotelCfg.limit.ToString()).FlushVars();
 
-            _ui.m_btnConstruct.m_txtCount.SetVar("value", leagueData.LeagueCoin.ToString()).FlushVars();
-            LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(leagueData.StoreLevel);
+            _ui.m_btnConstruct.m_txtCount.SetVar("value", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueCoin).ToString()).FlushVars();
+            LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(LeagueDataManager.Instance.StoreLevel);
             _ui.m_btnConstruct.m_txtCount.SetVar("maxValue", storeCfg.limitStore.ToString()).FlushVars();
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(ConstItemID.LEAGUE_COIN);
 

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

@@ -80,7 +80,7 @@ namespace GFGGame
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             if (cfg == null) return;
             int skillId = ScoreSystemData.Instance.GetShowSkillCfg(cardId).skillId;
-            int skillLv = SkillDataManager.Instance.GetSkillLv(cardId, skillId);
+            int skillLv = SkillDataManager.Instance.GetCardSkillLv(cardId, skillId);
             PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
             _ui.m_txtName.text = cfg.name;
             _ui.m_txtDiscribe.text = skillLvCfg.describe;