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

client_Zxw

2018-10-31 08c8ba1dd22f6e810e14b4b729c950523e06ac88

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

 Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Friday, September 21, 2018

//    [  Date ]:           Wednesday, October 31, 2018

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



using UnityEngine;

@@ -25,6 +25,7 @@
        public int RuneDrop { get ; private set ; }

        public int Fixed { get ; private set ; }

        public int AutoExit { get ; private set ; }

        public int Fightpower { get ; private set ; }



        public override string getKey()

        {

@@ -61,6 +62,8 @@
                Fixed=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 

            

                AutoExit=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 

			
                Fightpower=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0; 
            }

            catch (Exception ex)

            {


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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: eb8552f7e3b6ad843878daecebc9eb01
timeCreated: 1537535813
timeCreated: 1540967169
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/ClientVersion/VersionUpdateWin.cs

@@ -96,7 +96,14 @@
                if (timer > 1f)

                {

                    timer -= 1f;



                    m_ProgressSlider.value = VersionUtility.Instance.progress;



                    var downLoadedSize = ((float)RemoteFile.TotalDownloadedSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

                    var totalSize = ((float)VersionUtility.Instance.versionInfo.GetLatestVersion().file_size * 1024 / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

                    m_Progress.text = Language.GetFromLocal(13, StringUtility.Contact(downLoadedSize, "M", "/", totalSize, "M"));





                    m_Progress.text = StringUtility.Contact((VersionUtility.Instance.progress * 100).ToString("f0"), "%");

                }




 System/ClientVersion/VersionUtility.cs

@@ -171,7 +171,7 @@
    {

        if (IsMaoErGame())

        {

            if (maoerVersion.Keys.Contains("content"))

            if (maoerVersion != null && maoerVersion.Keys.Contains("content"))

            {

                return StringUtility.Contact(Language.GetFromLocal(30), "\r\n", maoerVersion["content"].ToString());

            }


 System/RuneTower/RuneTowerWin.cs

@@ -28,6 +28,7 @@
        [SerializeField] RawImage m_BossPortrait;

        [SerializeField] Transform m_ContainerReward;

        [SerializeField] PositionTween m_RewardShowTween;

        [SerializeField] Text m_FigthPower;

        [SerializeField] Text m_FloorRewardTitle;

        [SerializeField] ItemBehaviour m_ProductRune;

        [SerializeField] Button m_ViewProductRune;

@@ -83,6 +84,7 @@


            UpdateBossInfo();

            UpdateFloorRewardInfo();

            UpdateFightPower();



            runeSweepActionId = Config.Instance.Get<DailyQuestConfig>((int)DailyQuestType.RuneTowerSweep).RelatedID;

            OnRuneTowerSweepResult(runeSweepActionId);

@@ -237,6 +239,16 @@
            m_RunePreviewGroup.Display(nextUnLockFloor);

        }



        private void UpdateFightPower()

        {

            var towerConfig = Config.Instance.Get<RuneTowerConfig>(model.currentTower);

            var towerFloorConfig = Config.Instance.Get<RuneTowerFloorConfig>(model.selectedFloor);

            m_FigthPower.text = towerFloorConfig.Fightpower.ToString();



            var reached = PlayerDatas.Instance.baseData.FightPoint >= towerFloorConfig.Fightpower;

            m_FigthPower.color = UIHelper.GetUIColor(reached ? TextColType.Green : TextColType.Red);

        }



        private void PopupBossInfo()

        {

            showType = ShowType.BossInfo;

@@ -250,6 +262,7 @@
            showType = ShowType.RewardInfo;

            UpdateUIElement(showType);

            UpdateFloorRewardInfo();

            UpdateFightPower();

            m_RewardShowTween.Play();

        }



@@ -271,6 +284,7 @@
                    break;

                case ShowType.RewardInfo:

                    UpdateFloorRewardInfo();

                    UpdateFightPower();

                    break;

            }

        }