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

client_Wu Xijin

2019-06-28 37c32719d6a2af99771f48dd28f315f4ad0528d0

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

 Core/SDK/SDKUtility.cs

@@ -182,6 +182,7 @@
        m_Json.Clear();

        m_Json["code"] = CodeU2A.Init;

        m_Json["appID"] = VersionConfig.Get().appId;

        m_Json["gameID"] = VersionConfig.Get().gameId;

        SendMessageToSDK(m_Json);

#endif

        StartCoroutine("ProcessNetworkStatus");


 System/GeneralConfig/GeneralDefine.cs

@@ -199,6 +199,7 @@
    public static Dictionary<int, int> skillYinjis { get; private set; }

    public static List<int> onlyUsedAtBackpackItems { get; private set; }

    public static List<int> signInPromoteSkills = new List<int>();

    public static List<int> chestDisplayItems = new List<int>();



    public static void Init()

    {

@@ -808,6 +809,8 @@


            MasteryLoadingLevelLimit1 = GetInt("MasteryLoadingLevelLimit");

            MasteryLoadingLevelLimit2 = GetInt("MasteryLoadingLevelLimit", 2);



            chestDisplayItems = new List<int>(GetIntArray("ChestShowItems"));

        }

        catch (Exception ex)

        {


 System/ItemTip/ItemTipUtility.cs

@@ -6,7 +6,8 @@
using System.Collections;
using UnityEngine.UI;
using System.Collections.Generic;

using System.Linq;



namespace Snxxz.UI
{

    [XLua.LuaCallCSharp]
@@ -21,6 +22,7 @@
            KingTreasure,

            PetMount,

            SpiritWeapon,

            PeerlessChest,

        }

        public class TipData
@@ -208,6 +210,7 @@
        static VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } }
        static GatherSoulComposeModel gatherSoulComposeModel { get { return ModelCenter.Instance.GetModel<GatherSoulComposeModel>(); } }
        static ItemOverdueModel itemOverdueModel { get { return ModelCenter.Instance.GetModel<ItemOverdueModel>(); } }
        static BoxGetItemModel boxGetItemModel { get { return ModelCenter.Instance.GetModel<BoxGetItemModel>(); } }

        public static TipData mainTipData { get; private set; }
        public static TipData secondaryData { get; private set; }
@@ -261,6 +264,16 @@
                case TipType.Dogz:

                    mainTipData = CreateDogzEquipData(itemId);

                    break;

                case TipType.PeerlessChest:

                    mainTipData = CreateItemData(itemId);

                    mainTipData.getWay = default(GetWay);

                    Dictionary<int, int> selectItems;

                    if (boxGetItemModel.IsSelectItemByID(itemId, out selectItems))

                    {

                        secondaryData = CreateNormalEquipData(selectItems.Keys.First());

                        secondaryData.getWay = default(GetWay);

                    }

                    break;

                default:

                    mainTipData = CreateItemData(itemId);

                    break;

@@ -287,6 +300,9 @@
                    break;

                case TipType.SpiritWeapon:

                    WindowCenter.Instance.Open<SpiritWeaponTipWin>();

                    break;

                case TipType.PeerlessChest:

                    WindowCenter.Instance.Open<PeerlessChestTipWin>();

                    break;

                default:

                    WindowCenter.Instance.Open<ItemTipWin>();

@@ -1791,6 +1807,11 @@
        {

            var config = ItemConfig.Get(itemId);



            if (GeneralDefine.chestDisplayItems.Contains(itemId))

            {

                return TipType.PeerlessChest;

            }



            switch (config.Type)

            {

                case 101:


 System/ItemTip/PeerlessChestTipWin.cs

New file
@@ -0,0 +1,131 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Friday, June 28, 2019

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



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class PeerlessChestTipWin : Window

    {

        [SerializeField] Button m_Close1;

        [SerializeField] Button m_Close2;
        [SerializeField] ItemWidget m_ItemGroup;

        [SerializeField] SpiritWeaponWidget m_SpiritWeaponGroup;



        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_Close1.AddListener(CloseClick);

            m_Close2.AddListener(CloseClick);

        }



        protected override void OnPreOpen()

        {

            this.transform.localScale = Vector3.zero;

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            StopAllCoroutines();

        }



        protected override void OnAfterClose()

        {

        }



        protected override void OnActived()
        {
            base.OnActived();

            StartCoroutine(Co_DelayOneFrame());
        }

        #endregion



        IEnumerator Co_DelayOneFrame()
        {
            this.transform.localScale = Vector3.zero;
            DisplayItem();
            DisplaySpiritWeapon();
            yield return null;
            yield return null;
            this.transform.localScale = Vector3.one;
        }



        void DisplayItem()

        {

            m_ItemGroup.Display();

        }



        void DisplaySpiritWeapon()

        {

            if (ItemTipUtility.secondaryData != null)

            {

                m_SpiritWeaponGroup.Display(ItemTipUtility.secondaryData);

            }

        }



        [Serializable]

        public class ItemWidget

        {

            [SerializeField] TipItemBaseInfoWidget m_BaseInfoWidget;

            [SerializeField] TipItemDescriptionWidget m_DescriptionWidget;



            public void Display()

            {

                var data = ItemTipUtility.mainTipData;

                m_BaseInfoWidget.Display(data.baseInfo);

                m_DescriptionWidget.Display(data.baseInfo.itemId);

            }

        }





        [Serializable]

        public class SpiritWeaponWidget

        {

            [SerializeField] TipEquipBaseInfoWidget m_BaseInfoWidget;

            [SerializeField] TipBasePropertyWidget m_BasePropertyWidget;

            [SerializeField] TipSpiritWeaponPropertyWidget m_SpiritWeaponPropertyWidget;

            [SerializeField] TipItemDescriptionWidget m_DescriptionWidget;

            [SerializeField] TipJobAndPlaceWidget m_JobAndPlaceWidget;



            public void Display(ItemTipUtility.TipData data)

            {

                m_BaseInfoWidget.Display(data.baseInfo);

                m_BasePropertyWidget.Display(data.baseProperty);

                var property = data.spiritWeaponProperty;

                if (property.properties != null)

                {

                    m_SpiritWeaponPropertyWidget.gameObject.SetActive(true);

                    m_SpiritWeaponPropertyWidget.Display(property);

                }

                else

                {

                    m_SpiritWeaponPropertyWidget.gameObject.SetActive(false);

                }

                var itemId = data.baseInfo.itemId;

                m_DescriptionWidget.Display(itemId);

                m_JobAndPlaceWidget.Display(itemId);
            }

        }

    }



}










 System/ItemTip/PeerlessChestTipWin.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: f7a3507251475e24f80bc6d6e7cbece2
timeCreated: 1561690610
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: