Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <loader id="n37_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+    <loader id="n38_xv4o" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="509,1972"/>

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -129,9 +129,9 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入背景图", 1);
             ImportRes(BgSrcPaths, BgTargetPath, BgMd5FileSaveName);
 
-            // //卡牌背景
-            // EditorUtility.DisplayProgressBar("进度", "正在导入卡牌背景", 1);
-            // ImportRes(CardBgSrcPaths, CardBgTargetPath, CardBgMd5FileSaveName);
+            //卡牌背景
+            EditorUtility.DisplayProgressBar("进度", "正在导入卡牌背景", 1);
+            ImportRes(CardBgSrcPaths, CardBgTargetPath, CardBgMd5FileSaveName);
             //卡牌icon
             EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
             ImportRes(CardIconSrcPaths, CardIconTargetPath, CardMd5FileSaveName);

GameClient/Assets/Editor/FileUtil.cs

@@ -365,7 +365,7 @@ namespace GFGEditor
                 foreach (var lDir in localDirs)
                 {
                     string lDirName = Path.GetFileName(lDir);
-                    if (lDirName == "Card") continue;
+                    // if (lDirName == "Card") continue;
                     bool needDelete = false;
                     foreach (var sDir in souDirs)
                     {

GameClient/Assets/Game/HotUpdate/Constant/ConstStorageId.cs

@@ -11,6 +11,7 @@ namespace GFGGame
         public const int SKIP_CHECK_OPEN = 20003;//跳过检查功能开启0不跳过，1跳过
         public const int STORAGE_CUSTOME_SUIT_INDEX = 20004;//自定义套装当前使用索引
         public const int FIELD_AUTO_PLAY_SPEED = 20005;//田野调查战斗速度
+        public const int LAST_LOGIN_TIME = 20006;//上次登录时间
 
     }
 }

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

@@ -104,6 +104,10 @@ namespace GFGGame
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();
 
+            GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
+            long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            StorageSProxy.ReqSetClientValue(ConstStorageId.LAST_LOGIN_TIME, (int)lastTime).Coroutine();
+
             int skipGuide = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_SKIP_GUIDE);
 
             if (skipGuide <= 0 && LauncherConfig.netType == EnumNetType.LOCAL)
@@ -138,7 +142,7 @@ namespace GFGGame
             GameGlobal.userId = 0;
             GameGlobal.userAge = 0;
             GameGlobal.skipGuide = false;
-            if(GameGlobal.myUnit != null)
+            if (GameGlobal.myUnit != null)
             {
                 GameGlobal.myUnit.Dispose();
                 GameGlobal.myUnit = null;

GameClient/Assets/Game/HotUpdate/Data/Cache/DropOutDataCache.cs

@@ -8,102 +8,139 @@ namespace GFGGame
         private static Dictionary<int, List<DropOutData>> _probDic = new Dictionary<int, List<DropOutData>>();
 
 
+        // public static List<ItemData> GetDropItemDatas(int[] dropIds, bool doRandome)
+        // {
+        //     List<ItemData> result = new List<ItemData>();
+        //     foreach (int dropId in dropIds)
+        //     {
+        //         ItemData itemData = GetDropItemData(dropId, doRandome);
+        //         if (itemData != null)
+        //         {
+        //             result.Add(itemData);
+        //         }
+        //     }
+        //     return result;
+        // }
         public static List<ItemData> GetDropItemDatas(int[] dropIds, bool doRandome)
         {
             List<ItemData> result = new List<ItemData>();
             foreach (int dropId in dropIds)
             {
-                ItemData itemData = GetDropItemData(dropId, doRandome);
-                if (itemData != null)
-                {
-                    result.Add(itemData);
-                }
+                GetDropItemData(dropId, result);
+
             }
             return result;
         }
 
-        public static List<ItemData> GetDropItemDatas(int dropId, int count)
+        public static List<ItemData> GetDropItemData(int dropId, List<ItemData> result)
         {
-            List<ItemData> result = new List<ItemData>();
-            int tryCount = 0;
-            while(result.Count < count && tryCount < 1000)
+
+            List<DropOutCfg> dropOutCfgs = DropOutCfgArray.Instance.GetCfgs(dropId);
+
+            for (int i = 0; i < dropOutCfgs.Count; i++)
             {
-                ItemData itemData = GetDropItemData(dropId, true);
-                if(itemData != null)
+
+                List<DropOutCfg> _dropOutCfgs = DropOutCfgArray.Instance.GetCfgs(dropOutCfgs[i].item);
+                if (_dropOutCfgs.Count > 0)
                 {
-                    result.Add(itemData);
-                }
-                tryCount++;
-            }
-            return result;
-        }
 
-        public static ItemData GetDropItemData(int dropId, bool doRandome)
-        {
-            ItemData itemData = null;
-            List<DropOutData> dropOutDatas = null;
-            if(!_probDic.ContainsKey(dropId))
-            {
-                InitData(dropId);
-            }
-            dropOutDatas = _probDic[dropId];
-            if(dropOutDatas != null)
-            {
-                float result = Random.Range(0, 1f);
-                foreach(DropOutData dropOutData in dropOutDatas)
+                    GetDropItemData(dropOutCfgs[i].item, result);
+                }
+                else
                 {
-                    if(result <= dropOutData.WeightEnd || !doRandome)
+                    ItemData itemData = ItemUtil.createItemData(dropOutCfgs[i].item, dropOutCfgs[i].maxNum);// GetDropItemData(dropId, doRandome);
+                    if (dropOutCfgs[i].item > 0 && itemData != null)
                     {
-                        return GetItemData(dropOutData.dropOutCfg, doRandome);
+                        result.Add(itemData);
                     }
                 }
             }
-            return itemData;
+            return result;
         }
+        // public static List<ItemData> GetDropItemDatas(int dropId, int count)
+        // {
+        //     List<ItemData> result = new List<ItemData>();
+        //     int tryCount = 0;
+        //     while (result.Count < count && tryCount < 1000)
+        //     {
+        //         ItemData itemData = GetDropItemData(dropId, true);
+        //         if (itemData != null)
+        //         {
+        //             result.Add(itemData);
+        //         }
+        //         tryCount++;
+        //     }
+        //     return result;
+        // }
+
+        // public static ItemData GetDropItemData(int dropId, bool doRandome)
+        // {
+        //     ItemData itemData = null;
+        //     List<DropOutData> dropOutDatas = null;
+        //     if (!_probDic.ContainsKey(dropId))
+        //     {
+        //         InitData(dropId);
+        //     }
+        //     dropOutDatas = _probDic[dropId];
+        //     if (dropOutDatas != null)
+        //     {
+        //         float result = Random.Range(0, 1f);
+        //         foreach (DropOutData dropOutData in dropOutDatas)
+        //         {
+        //             if (result <= dropOutData.WeightEnd || !doRandome)
+        //             {
+        //                 return GetItemData(dropOutData.dropOutCfg, doRandome);
+        //             }
+        //         }
+        //     }
+        //     return itemData;
+        // }
+
+        // private static void InitData(int dropId)
+        // {
+        //     List<DropOutData> dropOutDatas = new List<DropOutData>();
+        //     _probDic[dropId] = dropOutDatas;
+        //     var arr = DropOutCfgArray.Instance.GetCfgs(dropId);
+        //     List<DropOutCfg> cfgs = new List<DropOutCfg>(arr);
+        //     float totalWeight = 0;
+        //     foreach (DropOutCfg cfg in cfgs)
+        //     {
+        //         totalWeight += cfg.weight;
+        //     }
+        //     float weightEnd = 0;
+        //     foreach (DropOutCfg cfg in cfgs)
+        //     {
+        //         DropOutData dropOutData = new DropOutData();
+        //         dropOutData.dropOutCfg = cfg;
+        //         weightEnd += cfg.weight;
+        //         dropOutData.WeightEnd = weightEnd / totalWeight;
+        //         dropOutDatas.Add(dropOutData);
+        //     }
+        // }
+
+        // private static ItemData GetItemData(DropOutCfg dropOutCfg, bool doRandomeNum)
+        // {
+        //     if (dropOutCfg.item >= 10000000)//掉落id
+        //     {
+        //         return GetDropItemData(dropOutCfg.item, doRandomeNum);
+        //     }
+        //     else if (dropOutCfg.item > 0)
+        //     {
+        //         int num = dropOutCfg.maxNum;
+        //         if (doRandomeNum)
+        //         {
+        //             num = Random.Range(dropOutCfg.minNum, dropOutCfg.maxNum + 1);
+        //         }
+        //         if (num > 0)
+        //         {
+        //             ItemData itemData = ItemDataPool.GetItemData(dropOutCfg.item);
+        //             itemData.num = num;
+        //             return itemData;
+        //         }
+        //     }
+        //     return null;
+        // }
 
-        private static void InitData(int dropId)
-        {
-            List<DropOutData> dropOutDatas = new List<DropOutData>();
-            _probDic[dropId] = dropOutDatas;
-            var arr = DropOutCfgArray.Instance.GetCfgs(dropId);
-            List<DropOutCfg> cfgs = new List<DropOutCfg>(arr);
-            float totalWeight = 0;
-            foreach(DropOutCfg cfg in cfgs)
-            {
-                totalWeight += cfg.weight;
-            }
-            float weightEnd = 0;
-            foreach(DropOutCfg cfg in cfgs)
-            {
-                DropOutData dropOutData = new DropOutData();
-                dropOutData.dropOutCfg = cfg;
-                weightEnd += cfg.weight;
-                dropOutData.WeightEnd = weightEnd/totalWeight;
-                dropOutDatas.Add(dropOutData);
-            }
-        }
 
-        private static ItemData GetItemData(DropOutCfg dropOutCfg, bool doRandomeNum)
-        {
-            if(dropOutCfg.item >= 10000000)//掉落id
-            {
-                return GetDropItemData(dropOutCfg.item, doRandomeNum);
-            }
-            else if(dropOutCfg.item > 0)
-            {
-                int num = dropOutCfg.maxNum;
-                if(doRandomeNum)
-                {
-                    num = Random.Range(dropOutCfg.minNum, dropOutCfg.maxNum + 1);
-                }
-                if(num > 0)
-                {
-                    ItemData itemData = ItemDataPool.GetItemData(dropOutCfg.item);
-                    itemData.num = num;
-                    return itemData;
-                }
-            }
-            return null;
-        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/Cache/StoryBonusDataCache.cs

@@ -8,39 +8,30 @@ namespace GFGGame
     {
         private static Dictionary<int, StoryBonusData> _bonusDic = new Dictionary<int, StoryBonusData>();
 
-        public static List<ItemData> GetBonusList(int levelID, bool hasOnce, bool doRandom = false)
+        public static List<ItemData> GetBonusList(int levelID, bool hasOnce)
         {
             StoryBonusData bonusData = GetBonusData(levelID);
             List<ItemData> bonusList = new List<ItemData>();
             if (hasOnce)
             {
                 bonusList.AddRange(bonusData.bonusOnce);
+                if (bonusData.bonusBase != null)
+                {
+                    bonusList.AddRange(bonusData.bonusBase);
+                }
             }
             else
             {
+                if (bonusData.bonusBase != null)
+                {
+                    bonusList.AddRange(bonusData.bonusBase);
+                }
                 if (bonusData.bonusRandom != null && bonusData.bonusRandom.Count > 0)
                 {
-                    if (doRandom)
-                    {
-                        StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
-                        StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-                        if(fightCfg != null)
-                        {
-                            List<ItemData> randomList = DropOutDataCache.GetDropItemDatas(fightCfg.bonusRandomArr, true);
-                            bonusList.AddRange(randomList);
-                        }
-                    }
-                    else
-                    {
-                        bonusList.AddRange(bonusData.bonusRandom);
-                    }
+                    bonusList.AddRange(bonusData.bonusRandom);
                 }
             }
-            if (bonusData.bonusBase != null)
-            {
-                bonusList.AddRange(bonusData.bonusBase);
-            }
-            
+
             return bonusList;
         }
 

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

@@ -44,10 +44,10 @@ namespace GFGGame
 
                 FunctionOpenCfg functionOpenCfg = FunctionOpenCfgArray.Instance.GetCfg(typeof(SuitListView).Name);
                 if (GameGlobal.myUnit != null//游戏角色初始数据不处理
-                    && itemCfg.rarity == ConstDressRarity.Rarity_TIANYI 
+                    && itemCfg.rarity == ConstDressRarity.Rarity_TIANYI
                     && StorageDataManager.Instance.GetStorageValue(ConstStorageId.FUNCTION_OPEN + functionOpenCfg.index) == 0)
                 {
-                    
+
                     FunctionOpenDataManager.Instance.CheckHasSpecialFunOpen();
                 }
             }
@@ -151,25 +151,41 @@ namespace GFGGame
             //五个属性中最大的为主属性
             mainScore = 1;
             mainScoreValue = 0;
-            if (itemCfg.score1 > mainScoreValue)
-            {
-                mainScoreValue = itemCfg.score1;
-                mainScore = 1;
-            }
-            if (itemCfg.score2 > mainScoreValue)
-            {
-                mainScoreValue = itemCfg.score2;
-                mainScore = 2;
-            }
-            if (itemCfg.score3 > mainScoreValue)
-            {
-                mainScoreValue = itemCfg.score3;
-                mainScore = 3;
-            }
-            if (itemCfg.score4 > mainScoreValue)
-            {
-                mainScoreValue = itemCfg.score4;
-                mainScore = 4;
+            // if (itemCfg.score1 > mainScoreValue)
+            // {
+            //     mainScoreValue = itemCfg.score1;
+            //     mainScore = 1;
+            // }
+            // if (itemCfg.score2 > mainScoreValue)
+            // {
+            //     mainScoreValue = itemCfg.score2;
+            //     mainScore = 2;
+            // }
+            // if (itemCfg.score3 > mainScoreValue)
+            // {
+            //     mainScoreValue = itemCfg.score3;
+            //     mainScore = 3;
+            // }
+            // if (itemCfg.score4 > mainScoreValue)
+            // {
+            //     mainScoreValue = itemCfg.score4;
+            //     mainScore = 4;
+            // }
+            mainScore = itemCfg.mainScore;
+            switch (mainScore)
+            {
+                case 1:
+                    mainScoreValue = itemCfg.score1;
+                    break;
+                case 2:
+                    mainScoreValue = itemCfg.score2;
+                    break;
+                case 3:
+                    mainScoreValue = itemCfg.score3;
+                    break;
+                case 4:
+                    mainScoreValue = itemCfg.score4;
+                    break;
             }
         }
         public static int GetItemScoreValue(int itemId, int scoreType)

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -25,8 +25,9 @@ namespace GFGGame
         public static Scene zoneScene;
         public static Unit myUnit;
         public static NumericComponent myNumericComponent;
+        public static int lastLoginTime;//上次登录时间
+
 
-        
 
         //平台
         public static int platformId = 1;

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

@@ -36,7 +36,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    List<ItemData> bonusList = StoryBonusDataCache.GetBonusList(response.LevelCfgId, true, true);
+                    List<ItemData> bonusList = StoryBonusDataCache.GetBonusList(response.LevelCfgId, true);
                     InstanceZonesDataManager.TrySetLevelPass(response.LevelCfgId);
                     InstanceZonesController.OnFinishStoryLevel(levelCfgId, true, true);
                     FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(response.LevelCfgId);//首次通过要检查是否有功能开启

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

@@ -166,7 +166,7 @@ namespace GFGGame
                 _cardObj = null;
             }
             string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
-             if (Versions.Contains(resPath))
+            if (Versions.Contains(resPath))
             {
                 _cardObj = DressUpUtil.AddAnimationObj(resPath);
                 SceneController.AddObjectToView(_cardObj, _wrapper, _ui.m_comCard.m_comCardHolder.m_holder, resPath, out _cardObj, out _wrapper);
@@ -512,7 +512,6 @@ namespace GFGGame
 
             UI_ComStarConsume listItem = UI_ComStarConsume.Proxy(obj);
             CardStarCfg cardStarCfg = listItem.target.parent.data as CardStarCfg;
-            listItem.target.data = cardStarCfg.materiarsArr[index][0];
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardStarCfg.materiarsArr[index][0]);
             listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
@@ -522,11 +521,12 @@ namespace GFGGame
             listItem.m_txtNeedCount.text = needCount.ToString();// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
             listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); //;  hasCount.ToString();
             listItem.m_btnPlus.visible = false;
-            if (listItem.m_btnPlus.data == null)
+            if (listItem.target.data == null)
             {
-                listItem.m_btnPlus.onClick.Add(() => OnClickBtnPlusStarConsum(index));
+                listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
             }
-            listItem.m_btnPlus.data = cardStarCfg.materiarsArr[index][0];
+            // listItem.m_btnPlus.data = cardStarCfg.materiarsArr[index][0];
+            listItem.target.data = cardStarCfg.materiarsArr[index][0];
 
             if (hasCount < needCount)
             {

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

@@ -729,16 +729,16 @@ namespace GFGGame
             ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
 
             listItem.m_ScoreType.visible = true;
-            int mainScore;
-            int mainValuel;
-            ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
-            listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + mainScore);
-
+            // int mainScore;
+            // int mainValuel;
+            // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
+            listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _fightCfg.scoreType);
+            listItem.m_txtScore.text = "" + DressUpMenuItemDataManager.GetItemScore(id, _fightCfg.scoreType);
 
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_txtScore.visible = false;
+            // listItem.m_txtScore.visible = false;
             //listItem.m_ScoreType.visible = true;
             listItem.m_imgNeed.visible = false;
 

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

@@ -117,10 +117,10 @@ namespace GFGGame
 
             RefreshList(EnumPhotographType.BG);
             SetUIView();
+            UpdateScene();
             PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             PhotographSceneManager.Instance.AddBodyItem();
-            UpdateScene();
-            PhotographDataManager.Instance.SetLayer(null, "refresh");
+            // PhotographDataManager.Instance.SetLayer(null, "refresh");
 
             if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
             {

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

@@ -367,14 +367,20 @@ namespace GFGGame
             _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
             _ui.m_comMineCircle.m_t1.ignoreEngineTimeScale = false;
             _ui.m_comMineCircle.m_t1.timeScale = _speed;
-            _ui.m_comMineCircle.m_t1.Play(() => { PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position); });
+            _ui.m_comMineCircle.m_t1.Play(() =>
+            {
+                PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position);
+            });
 
             _ui.m_comTargetCircle.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comTargetCircle.m_t0.timeScale = _speed;
             _ui.m_comTargetCircle.m_t0.Play();
             _ui.m_comTargetCircle.m_t1.ignoreEngineTimeScale = false;
             _ui.m_comTargetCircle.m_t1.timeScale = _speed;
-            _ui.m_comTargetCircle.m_t1.Play(() => { PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0)); });
+            _ui.m_comTargetCircle.m_t1.Play(() =>
+            {
+                PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0));
+            });
         }
         private void PlayScoreTWEffect(GGraph holderScore, Vector3 startValue, Vector3 endValue)
         {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -125,7 +125,7 @@ namespace GFGGame
             UpdateRoleLvl();
             _valueBarController.OnShown();
 
-            long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            long lastTime = GameGlobal.lastLoginTime;// GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
             {
                 ViewManager.Show<DailyLoginView>();