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

client_linchunjie

2018-08-30 ddf1a89cd290398b09d58d19ac1b4f01cc2e63f1

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

 Core/GameEngine/Model/Config/DungeonConfig.cs

@@ -1,16 +1,16 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Friday, May 18, 2018
//    [  Date ]:           Thursday, August 30, 2018

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

using UnityEngine;
using System;

namespace TableConfig {
namespace TableConfig

{


    
    public partial class DungeonConfig : ConfigBase {



    public partial class DungeonConfig : ConfigBase

    {

        public int ID { get ; private set ; }

        public int DataMapID { get ; private set ; }

        public int LineID { get ; private set ; }

@@ -28,6 +28,7 @@
        public string StepTime { get ; private set; } 

        public int[] BossActorID;

        public int[] Rewards;

        public string[] RewardCountDescriptions;

        public string Description { get ; private set; } 

        public int AutomaticATK { get ; private set ; }

        public int MapButton { get ; private set ; }

@@ -38,7 +39,8 @@
            return ID.ToString();

        }

        public override void Parse() {
        public override void Parse()

        {

            try

            {

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

@@ -90,13 +92,15 @@
                     int.TryParse(RewardsStringArray[i],out Rewards[i]);
                }

            

                Description = rawContents[17].Trim();

                RewardCountDescriptions = rawContents[17].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            

                AutomaticATK=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0; 
                Description = rawContents[18].Trim();

            

                MapButton=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0; 
                AutomaticATK = IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]) : 0;

            

                ShowNewItemTip=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0; 
                MapButton = IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]) : 0;



                ShowNewItemTip = IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]) : 0;

            }

            catch (Exception ex)

            {


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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d37aba7003df6ba498b9a3429748d8bf
timeCreated: 1526648349
timeCreated: 1535597382
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Dungeon/DungeonBreifInfo.cs

@@ -21,6 +21,7 @@
        [SerializeField] Text m_Description;

        [SerializeField] Button m_AddCntBtn;

        [SerializeField] ItemBehaviour[] m_Rewards;

        [SerializeField] Text[] m_RewardCounts;



        Dungeon dungeon;

        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -124,7 +125,7 @@
                if (i < dungeonConfig.Rewards.Length)

                {

                    behaviour.gameObject.SetActive(true);

                    behaviour.showCount = true;

                    behaviour.showCount = false;

                    behaviour.SetItem(dungeonConfig.Rewards[i], 0);

                }

                else

@@ -133,6 +134,23 @@
                }

            }



            if (m_RewardCounts != null)

            {

                for (int i = 0; i < m_RewardCounts.Length; i++)

                {

                    var behaviour = m_RewardCounts[i];

                    if (i < dungeonConfig.RewardCountDescriptions.Length)

                    {

                        behaviour.gameObject.SetActive(true);

                        behaviour.text = dungeonConfig.RewardCountDescriptions[i];

                    }

                    else

                    {

                        behaviour.gameObject.SetActive(false);

                    }

                }

            }



            CheckAchievementGuide();

        }