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

client_linchunjie

2018-08-27 4fdabfb10883c3977b1eb4f8613539a4ee3606e8

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

 Fight/Stage/StageManager.cs

@@ -89,7 +89,7 @@
            }

            else

            {

                SnxxzGame.Instance.StartCoroutine(BackToNoviceVillageWhileMapResourceLacked());

                SnxxzGame.Instance.StartCoroutine(BackToNoviceVillageWhileMapResourceLacked(mapResConfig.ID));

            }

        }

    }

@@ -324,8 +324,9 @@
        SystemSetting.Instance.SetFPSLimit(SystemSetting.Instance.GetFPSLimit());

    }



    IEnumerator BackToNoviceVillageWhileMapResourceLacked()

    IEnumerator BackToNoviceVillageWhileMapResourceLacked(int _mapResId)

    {

        currentMapResId = _mapResId;

        LoadingWin.targetMapResId = 1;

        WindowCenter.Instance.Open<LoadingWin>(true);




 System/AssetVersion/AssetVersion.cs

@@ -93,36 +93,46 @@
        }

    }

    public bool CheckLocalFileValid()

    public bool CheckLocalFileValid(bool _completeFile)

    {

        if (extersion == ".manifest" || extersion == ".bytes" || extersion == ".txt" || extersion == ".dll")

        if (_completeFile)

        {

            var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath);

            var fileInfo = new FileInfo(path);



            if (!fileInfo.Exists || fileInfo.Length != size || md5 != FileExtersion.GetMD5HashFromFile(path))

            {

                return false;

            }

        }

        else if (string.IsNullOrEmpty(extersion) || extersion.Length == 0)

        {

            var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath);

            var fileInfo = new FileInfo(path);



            var manifestAssetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact(m_RelativePath, ".manifest"));

            if (!fileInfo.Exists || fileInfo.Length != size || manifestAssetVersion == null || !manifestAssetVersion.CheckLocalFileValid())

            {

                return false;

            }

            return fileInfo.Exists && fileInfo.Length == size && md5 == FileExtersion.GetMD5HashFromFile(path);

        }

        else

        {

            var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath);

            var fileInfo = new FileInfo(path);

            if (!fileInfo.Exists || fileInfo.Length != size)

            if (extersion == ".manifest" || extersion == ".bytes" || extersion == ".txt" || extersion == ".dll")

            {

                return false;

                var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath);

                var fileInfo = new FileInfo(path);



                if (!fileInfo.Exists || fileInfo.Length != size || md5 != FileExtersion.GetMD5HashFromFile(path))

                {

                    return false;

                }

            }

            else if (string.IsNullOrEmpty(extersion) || extersion.Length == 0)

            {

                var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath);

                var fileInfo = new FileInfo(path);



                var manifestAssetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact(m_RelativePath, ".manifest"));

                if (!fileInfo.Exists || fileInfo.Length != size || manifestAssetVersion == null || !manifestAssetVersion.CheckLocalFileValid(false))

                {

                    return false;

                }

            }

            else

            {

                var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath);

                var fileInfo = new FileInfo(path);

                if (!fileInfo.Exists || fileInfo.Length != size)

                {

                    return false;

                }

            }

        }




 System/AssetVersion/AssetVersionUtility.cs

@@ -91,7 +91,7 @@
            {

                foreach (var assetVersion in assetVersions.Values)

                {

                    if (!assetVersion.CheckLocalFileValid())

                    if (!assetVersion.CheckLocalFileValid(false))

                    {

                        if (assetVersion.IsPriorAsset())

                        {


 System/AssetVersion/DownLoadAndDiscompressTask.cs

@@ -3,6 +3,7 @@
using UnityEngine;
using System;
using Snxxz.UI;
using System.Threading;

public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask>

{

@@ -124,8 +125,14 @@

    private void OnFileDownLoadCompleted(bool _ok, AssetVersion _assetVersion)

    {

        var correctFile = false;

        if (_ok)

        {

            correctFile = _assetVersion.CheckLocalFileValid(true);

        }



        if (_ok && correctFile)

        {

            okCount++;

            _assetVersion.localValid = true;

        }


 System/Compose/New/ComposeWin.cs

@@ -32,6 +32,8 @@
        [SerializeField]

        private FunctionButton _itemUITitleType;

        [SerializeField]

        private FunctionButton _dogzEquipFunc;

        [SerializeField]

        private FunctionButtonGroup _funcBtnGroup;

        #endregion



@@ -54,12 +56,12 @@
            _godequipUITitleType.onClick.AddListener(OnClickGodEquipCompose);

            _equipUITitleType.onClick.AddListener(OnClickEquipCompose);

            _itemUITitleType.onClick.AddListener(OnClickItemCompose);

            _dogzEquipFunc.AddListener(ClickDogzEquipCompose);

            _prePageBtn.onClick.AddListener(OnClickLeftBtn);

            _nextPageBtn.onClick.AddListener(OnClickRightBtn);

            _closeBtn.onClick.AddListener(OnClickCloseBtn);



        }



        protected override void OnPreOpen()

        {

            ComposeModel.ResetModel();

@@ -141,6 +143,22 @@
            _funcBtnGroup.TriggerLast();

        }





        private void ClickDogzEquipCompose()

        {

            CloseSubWindows();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<ComposeDogzEquipWin>();

            }

            else

            {

                WindowCenter.Instance.Open<ComposeDogzEquipWin>();

            }



            functionOrder = _dogzEquipFunc.order;

        }



        private void OnClickItemCompose()

        {

            

@@ -218,6 +236,7 @@
            WindowCenter.Instance.CloseImmediately<ComposeEquipWin>();

            WindowCenter.Instance.CloseImmediately<ComposeToolsWin>();

            WindowCenter.Instance.CloseImmediately<ComposeWingsWin>();

            WindowCenter.Instance.CloseImmediately<ComposeDogzEquipWin>();

        }



        public void OnClickCloseBtn()


 System/MainInterfacePanel/TipPanel.cs

@@ -89,13 +89,27 @@
                {

                    if (InGameDownLoad.Instance.CheckDominantDownLoad())

                    {

                        if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork)

                        if (InGameDownTestUtility.enable)

                        {

                            InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Half);

                            if (InGameDownTestUtility.isWifi)

                            {

                                InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Half);

                            }

                            else

                            {

                                InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);

                            }

                        }

                        else

                        {

                            InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);

                            if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork)

                            {

                                InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Half);

                            }

                            else

                            {

                                InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);

                            }

                        }

                    }

                }


 System/Strengthening/EquipSuit/PlayerSuitModel.cs

@@ -137,11 +137,10 @@
        /// <summary>

        /// 获取排序后的装备位顺序

        /// </summary>

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

        Dictionary<int, ItemModel> equipDict;

        public List<int> GetEquipOrderlist(SuitType type)

        {

            orderlist.Clear();

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

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);

            if (singlePack == null)

            {

@@ -772,8 +771,7 @@
                return;



            redSuitType = EquipSuitTips.E_SuitType;

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

            orderPlacelist.AddRange(orderlist);

            List<int> orderPlacelist = GetEquipOrderlist(redSuitType);

            orderPlacelist.Sort(CompareSuitLV);



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

@@ -809,9 +807,7 @@
                    break;

            }



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

            GetEquipOrderlist(redSuitType);

            orderPlacelist.AddRange(orderlist);

            List<int> orderPlacelist = GetEquipOrderlist(redSuitType);

            orderPlacelist.Sort(CompareSuitLV);



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


 System/Strengthening/EquipSuitTips.cs

@@ -42,7 +42,7 @@
    #endregion



    #region 数据

    private List<int> equipPartlist = new List<int>();

    private List<int> equipPartlist;

    private EquipSuitAttrConfig _equipSuitProModel;

    private EquipSuitCompoundConfig _equipSuitMatModel;

    private List<Transform> _materialPoslist = new List<Transform>();

@@ -153,7 +153,7 @@
                E_SuitType = SuitType.HighSuit;

            }

        }

        equipPartlist.AddRange(SuitModel.GetEquipOrderlist(E_SuitType));

        equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType);

        CreateEquipSuitCell();

        StartCoroutine(SetOffestPos());

    }

@@ -786,7 +786,7 @@
    {

        int curSelect = equipPartlist[presentIndex];

        E_SuitType = E_SuitType == SuitType.LowSuit ? SuitType.HighSuit : SuitType.LowSuit;

        equipPartlist.AddRange(SuitModel.GetEquipOrderlist(E_SuitType));

        equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType);

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

        {

            if (equipPartlist[i] == curSelect)


 System/Strengthening/GodBeastAttributes.cs

@@ -32,6 +32,9 @@


        [SerializeField] Toggle m_DoubleToggle;

        [SerializeField] Button m_StrengthenBtn;



        [SerializeField] UIAlphaTween m_UIAlphaTween;

        [SerializeField] Slider m_Slider;

        DogzModel Dogz_model;

        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
        private Dictionary<int, int> QualityLimit = new Dictionary<int, int>();

@@ -89,7 +92,20 @@
        }

        private void OnClickStrengthBtn()

        {



            Dictionary<int, int> DicAb = m_GodBeastSlidingList.Absorption_Dic;

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

            foreach (var key in DicAb.Keys)

            {

                List.Add(key);

            }

            if (m_DoubleToggle.isOn)

            {                
                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, List,1);

            }

            else

            {

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, List, 0);

            }

        }

        private void ChooseToModify(int locationMarker)

        {

@@ -163,6 +179,7 @@
                    m_ExpSlider.delay = 0f;

                    m_ExpSlider.ResetStage();

                    m_ExpSlider.value = 1;

                    m_Slider.gameObject.SetActive(false);

                    m_ExpNum.text = DogzEquipConfig.upExpTotal + "/" + DogzEquipConfig.upExpTotal;

                }

                else

@@ -225,23 +242,89 @@
            m_FrameNull.gameObject.SetActive(true);

            m_FullLevel.SetActive(false);

            int toLv = ToLv(ToExpTotal);

            m_LvNowText.text = "+"+DogZLv.ToString();

            m_LvNowText.text = "+" + DogZLv.ToString();

            if (DogZLv == toLv)

            {

                m_LvNextText.text = "+"+(toLv + 1).ToString();

                m_LvNextText.text = "+" + (toLv + 1).ToString();

            }

            else

            {

                m_LvNextText.text = "+"+toLv.ToString();

                m_LvNextText.text = "+" + toLv.ToString();

            }

            var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv);

            int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType);

            int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue);

            if (ToExpTotal == 0)

            {

                m_Slider.gameObject.SetActive(false);

                m_TextAttributesAdd1.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

                m_ExpNum.text = DogZExp + "/" + DogzEquipConfig.upExpTotal;

                if (AttType.Length > 1)

                {

                    m_TextAttributes1.gameObject.SetActive(true);

                    m_TextAttributes2.gameObject.SetActive(true);

                    string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                    string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;

                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                    m_TextAttributes2.text = StrName2 + ":" + AttValue[1];

                }

                else

                {

                    m_TextAttributes2.gameObject.SetActive(false);

                    string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                }

            }

            else

            {

                m_ExpNum.text = DogZExp + "+" + ToExpTotal + "/" + DogzEquipConfig.upExpTotal;

                m_Slider.gameObject.SetActive(true);

                if (DogZExp + ToExpTotal >= DogzEquipConfig.upExpTotal)

                {

                    m_Slider.value = 1f;

                }

                else

                {

                    m_Slider.value = (float)(DogZExp + ToExpTotal) / (float)(DogzEquipConfig.upExpTotal);

                }

                m_UIAlphaTween.Play();

                var DogzEquipToConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, toLv);

                int[] AttTypeTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attType);

                int[] AttValueTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attValue);

                string strColor = string.Format(Language.Get("DogzGreenText"), ToExpTotal);

                m_ExpNum.text = DogZExp + strColor + "/" + DogzEquipConfig.upExpTotal;

                if (AttType.Length > 1)

                {

                    m_TextAttributes1.gameObject.SetActive(true);

                    m_TextAttributes2.gameObject.SetActive(true);

                    m_TextAttributesAdd1.gameObject.SetActive(true);

                    m_TextAttributesAdd2.gameObject.SetActive(true);

                    string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                    string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;

                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                    m_TextAttributes2.text = StrName2 + ":" + AttValue[1];

                    m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);

                    m_TextAttributesAdd2.text = "+" + (AttValueTo[1] - AttValue[1]);

                }

                else

                {

                    m_TextAttributes1.gameObject.SetActive(true);

                    m_TextAttributesAdd1.gameObject.SetActive(true);

                    m_TextAttributes2.gameObject.SetActive(false);

                    m_TextAttributesAdd2.gameObject.SetActive(false);

                    string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                    m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);

                }

            }



            if (ToExpTotal == 0)

            {

                m_StrengthenBtn.interactable = false;

            }

            else

            {

                m_StrengthenBtn.interactable = true;

            }

        }



@@ -253,7 +336,7 @@
                return DogzLv;

            }

            int lv = QualityLimit[m_DogZItemModel.chinItemModel.ItemColor];

            for (int i = lv; i >=0; i--)

            for (int i = lv; i >= 0; i--)

            {

                var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, i);

                if (ToExpTotal < DogzEquipConfig.upExpTotal)


 System/Strengthening/GodBeastSlidingList.cs

@@ -132,11 +132,13 @@
        }
        private void OnEnable()

        {



        }
            playerPack.RefreshItemCountAct += RefreshItemCountAct;

            playerPack.ItemCntReduceAct += ItemCntReduceAct;

        }

        private void OnDisable()

        {



            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            playerPack.ItemCntReduceAct -= ItemCntReduceAct;

        }

        public void Init()

@@ -162,7 +164,41 @@
        {

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

        }

        private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)

        {

            if (arg1 == PackType.rptDogzItem)

            {

                if (m_ToggleAll.isOn)

                {

                    m_ToggleAll.isOn = false;

                }

                GetGodBeastBag();

                FilterQuality();

                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

                if (AbsorbEvent != null)

                {

                    AbsorbEvent(AbsorptionDic);

                }

            }

        }



        private void RefreshItemCountAct(PackType arg1, int arg2, int arg3)

        {

            if (arg1 == PackType.rptDogzItem)

            {

                if (m_ToggleAll.isOn)

                {

                    m_ToggleAll.isOn = false;

                }

                GetGodBeastBag();

                FilterQuality();

                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

                if (AbsorbEvent != null)

                {

                    AbsorbEvent(AbsorptionDic);

                }

            }

        }

        private void GetGodBeastBag()//获取神兽背包数据排序

        {

            GodBeastBagList.Clear();


 System/WindowBase/Window.cs

@@ -38,6 +38,7 @@
        }



        public bool playAnimation { get; set; }

        public bool executedActiveWindow { get; set; }



        internal Window Open()

        {

@@ -65,6 +66,7 @@
                Debug.Log(ex.StackTrace);

            }



            executedActiveWindow = false;

            RectTransform parent = null;

            try

            {

@@ -151,6 +153,7 @@
                windowState = WindowState.Closing;

            }



            executedActiveWindow = false;

            return this;

        }



@@ -207,6 +210,7 @@
            try

            {

                OnAfterClose();

                executedActiveWindow = false;

            }

            catch (System.Exception ex)

            {

@@ -237,6 +241,11 @@
        public virtual void CloseClick()

        {

            CloseImmediately();

        }



        public void ChildActive()

        {

            OnActived();

        }



        protected virtual void LateUpdate()

@@ -350,6 +359,7 @@
                    try

                    {

                        OnAfterClose();

                        executedActiveWindow = false;

                    }

                    catch (System.Exception ex)

                    {

@@ -400,6 +410,7 @@
                try

                {

                    OnAfterClose();

                    executedActiveWindow = false;

                }

                catch (System.Exception ex)

                {

@@ -439,7 +450,37 @@


            try

            {

                OnActived();

                var isChildWindow = WindowConfig.Get().IsChildWindow(this.gameObject.name);

                if (isChildWindow)

                {

                    var parentName = string.Empty;

                    WindowConfig.Get().FindParentWindow(this.gameObject.name, out parentName);

                    var parentWindow = WindowCenter.Instance.Get(parentName);

                    if (parentWindow != null && parentWindow.executedActiveWindow)

                    {

                        OnActived();

                        executedActiveWindow = true;

                    }

                }

                else

                {

                    OnActived();

                    executedActiveWindow = true;

                    var childWindows = WindowConfig.Get().FindChildWindows(this.gameObject.name);

                    var isParentWindow = childWindows != null;

                    if (isParentWindow)

                    {

                        foreach (var child in childWindows)

                        {

                            var window = WindowCenter.Instance.Get(child);

                            if (window != null && !window.executedActiveWindow)

                            {

                                window.ChildActive();

                            }

                        }

                    }

                }



            }

            catch (Exception ex)

            {


 UI/Common/WindowConfig.cs

@@ -7,7 +7,9 @@
public class WindowConfig : ScriptableObject

{

    public WindowTable[] windows;
    public WindowTable[] windows;

    public Dictionary<string, List<string>> parentChildrenTable = new Dictionary<string, List<string>>();
    public List<string> childWindows = new List<string>();

    static WindowConfig config;
    public static WindowConfig Get()

@@ -15,11 +17,21 @@
        if (config == null)

        {

            config = Resources.Load<WindowConfig>("ScriptableObject/Config/WindowConfig");

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

            {

                var table = config.windows[i];

                var children = config.parentChildrenTable[table.parent] = new List<string>();

                for (int j = 0; j < table.orderTables.Length; j++)

                {

                    children.Add(table.orderTables[j].window);

                }



                config.childWindows.AddRange(children);

            }

        }



        return config;

    }


    public bool FindChildWindow(string _parent, int _order, out string _child)

    {

@@ -63,6 +75,23 @@
        return false;

    }

    public List<string> FindChildWindows(string _parent)

    {

        if (parentChildrenTable.ContainsKey(_parent))

        {

            return parentChildrenTable[_parent];

        }

        else

        {

            return null;

        }

    }

    public bool IsChildWindow(string _name)

    {

        return childWindows.Contains(_name);

    }

    [Serializable]
    public struct WindowTable

    {