Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-09-03 e6d84cb617d7a9981f56a1a624d6c8e4618893a7

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/TrialExchangeConfig.cs

@@ -1,16 +1,16 @@
//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Monday, August 20, 2018

//--------------------------------------------------------



using UnityEngine;

using System;



namespace TableConfig {



    
    public partial class TrialExchangeConfig : ConfigBase {



//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Monday, September 03, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class TrialExchangeConfig : ConfigBase {

        public int id { get ; private set ; }

        public int[] exchangeItemID;

        public int exchangeItemCount { get ; private set ; }

@@ -18,15 +18,16 @@
        public int tokenId { get ; private set ; }

        public int tokenCount { get ; private set ; }

        public string description { get ; private set; } 



        public override string getKey()

        {

            return id.ToString();

        }



        public override void Parse() {

            try

            {

        public string chestDesc { get ; private set; } 

        public override string getKey()
        {
            return id.ToString();
        }

        public override void Parse() {
            try
            {
                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 

            

                string[] exchangeItemIDStringArray = rawContents[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
@@ -45,17 +46,19 @@
                tokenCount=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 

            

                description = rawContents[6].Trim();

            }

            catch (Exception ex)

            {

                DebugEx.Log(ex);

            }

        }

	
    }



}









			
                chestDesc = rawContents[7].Trim();
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 95c6c6944c394ac4381e86d9ce3006fb
timeCreated: 1534744580
timeCreated: 1535958653
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Dungeon/TrialDungeonModel.cs

@@ -209,17 +209,17 @@
            {

                NewBieCenter.Instance.RemoveNewBieGuide(TRIALEXCHANGE_GUIDE);

            }

            var tokenConfig = Config.Instance.Get<ItemConfig>(config.tokenId);

            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

                Language.Get("TokenUseConfirm", config.tokenCount, tokenConfig.ItemName, config.description), (bool isOk) =>

                   {

                       if (isOk)

                       {

                           CA32F_tagCMTrialExchange pak = new CA32F_tagCMTrialExchange();

                           pak.ID = (uint)_id;

                           GameNetSystem.Instance.SendInfo(pak);

                       }

                   });

            //var tokenConfig = Config.Instance.Get<ItemConfig>(config.tokenId);

            //ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

            //    Language.Get("TokenUseConfirm", config.tokenCount, tokenConfig.ItemName, config.description), (bool isOk) =>

            //       {

            //           if (isOk)

            //           {

            CA32F_tagCMTrialExchange pak = new CA32F_tagCMTrialExchange();

            pak.ID = (uint)_id;

            GameNetSystem.Instance.SendInfo(pak);

            //           }

            //       });

            return true;

        }




 System/Dungeon/TrialExchangeBehaviour.cs

@@ -15,6 +15,7 @@
        [SerializeField] ItemCell m_Item;

        [SerializeField] Text m_Description;

        [SerializeField] Text m_SpecialDescription;

        [SerializeField] Text m_ChestDescription;

        [SerializeField] ItemBehaviour m_Token;

        [SerializeField] LongPressButton m_Exchange;

        [SerializeField] Image m_Redpoint;

@@ -37,16 +38,27 @@
            if (trialExchangeId != 0)

            {

                int error = 0;

                if (!model.TrialSendExchange(trialExchangeId, out error))

                var config = Config.Instance.Get<TrialExchangeConfig>(trialExchangeId);

                if (config != null)

                {

                    if (error == 1)

                    {

                        var config = Config.Instance.Get<TrialExchangeConfig>(trialExchangeId);

                        if (config != null)

                        {

                            ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(config.tokenId);

                        }

                    }

                    var itemConfig = Config.Instance.Get<ItemConfig>(model.GetExchangeItemByJob(config));

                    ItemAttrData itemAttrData = new ItemAttrData(itemConfig.ID, true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData, false);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().curAttrData.SetTipsFuncBtn(ItemWinBtnType.exchange,

                        (ItemWinBtnType btnType, string value) =>

                     {

                         if (btnType == ItemWinBtnType.exchange)

                         {

                             if (!model.TrialSendExchange(trialExchangeId, out error))

                             {

                                 if (error == 1)

                                 {

                                     ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(config.tokenId);

                                 }

                             }

                         }

                     });

                    ModelCenter.Instance.GetModel<ItemTipsModel>().ShowUICtrl();

                }

            }

        }

@@ -71,7 +83,7 @@


        public void Display(int id, bool equipBetter = true, bool first = false)

        {

            m_Bottom.SetSprite(first ? "SpecialExchangeBottom" : "Title_PopupWindow");

            m_Bottom.SetSprite(first ? "XT_VIP_63" : "XT_VIP_63");

            m_ContainerSpecial.gameObject.SetActive(first);

            m_ContainerNormal.gameObject.SetActive(!first);

            trialExchangeId = id;

@@ -95,9 +107,13 @@
            {

                m_SpecialDescription.text = config.description;

            }

            if (m_ChestDescription != null)

            {

                m_ChestDescription.text = config.chestDesc;

            }

            m_Token.SetItem(config.tokenId, config.tokenCount);

            var count = model.GetTrialTokenCount(config.tokenId);

            m_Token.count.text = StringUtility.Contact(count >= config.tokenCount ? "<color=#35e112>" : string.Empty, count,

            m_Token.count.text = StringUtility.Contact(count >= config.tokenCount ? "<color=#109d06>" : string.Empty, count,

                count >= config.tokenCount ? "</color>" : string.Empty, "/", config.tokenCount);

            var equipCompare = model.EquipCompare(model.GetExchangeItemByJob(config));

            m_Up.gameObject.SetActive(equipCompare == 1);


 System/FairyAu/FairyGrabBossBehaviour.cs

@@ -128,7 +128,7 @@
            }

            m_ContainerKilled.gameObject.SetActive(killed && opened);

            m_ContainerKilling.gameObject.SetActive(!killed && opened);

            m_BossPortrait.material = opened ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            m_BossPortrait.material = opened && !killed ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            m_ContainerMapName.gameObject.SetActive(!opened);

        }




 System/FairyAu/FairyGrabBossWin.cs

@@ -180,6 +180,10 @@
            var error = 0;

            if (model.TestEnterDungeon(model.selectBoss, out error))

            {

                if (IsBossKilled(model.selectBoss))

                {

                    SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver");

                }

                WindowJumpMgr.Instance.ClearJumpData();

                WindowCenter.Instance.Close<LootPreciousFrameWin>();

                MapTransferUtility.Instance.MoveToNPC(model.selectBoss);

@@ -188,6 +192,18 @@
            {

                model.DisplayErrorTip(error);

            }

        }



        bool IsBossKilled(int bossId)

        {

            FairyGrabBossModel.BossProgressInfo bossProgress;

            bool killed = false;

            if (model.TryGetBossProgress(bossId, out bossProgress))

            {

                var progress = 1 - (float)bossProgress.currentHp / bossProgress.totalHp;

                killed = progress >= 1;

            }

            return killed;

        }



        private void KillRecord()

@@ -221,10 +237,11 @@


        void BossAllProgressUpdate()

        {

            if (!autoSelect)

            if (!autoSelect && model.InActivityTime)

            {

                AutoSelect();

            }

            autoSelect = true;

        }



        private void StateUpdate()

@@ -234,7 +251,6 @@


        void AutoSelect()

        {

            autoSelect = true;

            var index = 0;

            for (int i = 0; i < model.bosses.Count; i++)

            {


 System/Treasure/TreasureLevelUpWin.cs

@@ -476,6 +476,13 @@
            }

            m_GetTreasureBtn.gameObject.SetActive(!_unlockAchievement || achievement.completed);

            m_ContainerLimit.gameObject.SetActive(_unlockAchievement && !achievement.completed);



            if (model.IsVersionUnOpenTreasure(m_Treasure.id))

            {

                m_TreasureChallengeLimit.text = Language.Get("TreasureNoOpen");

                return;

            }



            if (_unlockAchievement && !achievement.completed)

            {

                var _achievementConfig = Config.Instance.Get<SuccessConfig>(_achievementId);


 System/Treasure/TreasureModel.cs

@@ -173,6 +173,7 @@
        List<int> eightFurnacesAchievements = new List<int>();

        List<int> m_CacheGotAchievements = new List<int>();

        Dictionary<int, int> treasureStageShowDict = new Dictionary<int, int>();

        List<int> treasureUnOpens = new List<int>();//版本未开放法宝



        public Dictionary<int, int> fairyTreasureGetDict { get; private set; }



@@ -1178,6 +1179,11 @@
            return eightFurnacesAchievements;

        }



        public bool IsVersionUnOpenTreasure(int _id)

        {

            return treasureUnOpens.Contains(_id);

        }



        private void ParseConfigs()

        {

            var treasureConfigs = Config.Instance.GetAllValues<TreasureConfig>();

@@ -1289,6 +1295,9 @@
            treasureBackPercent = float.Parse(funcConfig.Numerical2);

            funcConfig = Config.Instance.Get<FuncConfigConfig>("TreasureExitLimit");

            treasureExitLvLimit = int.Parse(funcConfig.Numerical1);



            funcConfig = Config.Instance.Get<FuncConfigConfig>("TreasureNoOpen");

            treasureUnOpens.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1));

        }



        const string pattern = "\\\"[0-9]\\\":\\[[0-9|,]*\\]";