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

Client_PangDeRong

2018-09-03 7e668d421d77874733dba9794d10017cf56beffa

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

 Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs

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

//    [Author]:            第二世界

//    [  Date ]:           Thursday, August 16, 2018

//    [  Date ]:           Monday, September 03, 2018
//--------------------------------------------------------



using UnityEngine;

@@ -23,6 +23,7 @@
        public string Icon { get ; private set; } 

        public string Name { get ; private set; } 

        public string targetDescription { get ; private set; } 

        public int effectId { get ; private set ; }


        public override string getKey()

        {

@@ -60,6 +61,8 @@
                Name = rawContents[10].Trim();

            

                targetDescription = rawContents[11].Trim();

			
                effectId=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
            }

            catch (Exception ex)

            {


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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 761a8477b6259554ab927daec347dba7
timeCreated: 1534424449
timeCreated: 1535981375
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Treasure/TreasureSoulWin.cs

@@ -23,6 +23,7 @@
        [SerializeField] Text m_SoulName;

        [SerializeField] Text m_SoulDescription;

        [SerializeField] Image m_SoulTarget;

        [SerializeField] UIEffect m_SoulEffect;

        [SerializeField] Button m_Active;

        [SerializeField] Text m_ActiveText;

        [SerializeField] Button m_GotoRealm;

@@ -272,10 +273,16 @@
                        }

                    }

                    m_ContainerPreview.gameObject.SetActive(!special.active);

                    m_SoulEffect.StopImediatly();

                    if (!special.active)

                    {

                        DisplayPreview(model.selectSoul);

                    }

                    else

                    {

                        m_SoulEffect.effect = config.effectId;

                        m_SoulEffect.Play();

                    }

                }

            }

        }