Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-27 44d703088b569886cfd746e5bb998dbeda3520c3

Merge branch 'master' into 3687天赋功能

 Fight/Actor/State/SMB/AirRun_9.cs

@@ -4,14 +4,13 @@
{
    private bool m_SendOnce = false;
    private float m_CalculateRideTime;
    public float m_FrameCount = 0;
    private float m_EscapeTime;

    protected override void OnEnter(GActor owner, Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
    {
        base.OnEnter(owner, animator, stateInfo, layerIndex);
        m_SendOnce = false;
        m_CalculateRideTime = Time.time;
        m_FrameCount = 0;
    }

    protected override void OnUpdate(GActor owner, Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
@@ -28,10 +27,10 @@
                }
            }

            m_FrameCount++;
            if ((m_FrameCount % 20) == 0)
            if ((Time.realtimeSinceStartup - m_EscapeTime) > .66f)
            {
                PlayerDatas.Instance.hero.PlayFootAudio();
                m_EscapeTime = Time.realtimeSinceStartup;
            }
        }
    }

 Fight/Actor/State/SMB/HorseRun_7.cs

@@ -2,11 +2,10 @@

public class HorseRun_7 : RunBase
{
    public float m_FrameCount = 0;
    private float m_EscapeTime;
    protected override void OnEnter(GActor owner, Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
    {
        base.OnEnter(owner, animator, stateInfo, layerIndex);
        m_FrameCount = 0;
    }

    protected override void OnUpdate(GActor owner, Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
@@ -15,10 +14,10 @@

        if (owner.ServerInstID == PlayerDatas.Instance.PlayerId)
        {
            m_FrameCount++;
            if ((m_FrameCount % 19) == 0)
            if ((Time.realtimeSinceStartup - m_EscapeTime) > .65f)
            {
                PlayerDatas.Instance.hero.PlayFootAudio();
                m_EscapeTime = Time.realtimeSinceStartup;
            }
        }


 System/ClientVersion/VersionUtility.cs

@@ -10,6 +10,7 @@
using LitJson;

using System.IO;

using Snxxz.UI;

using System.Text;



public class VersionUtility : Singleton<VersionUtility>

{

@@ -67,7 +68,7 @@
        if (_ok)

        {

            versionInfo = JsonMapper.ToObject<VersionInfo>(_result);

            if (NeedUpdate())

            if (NeedNormalUpdate())

            {

                switch (Application.platform)

                {

@@ -110,7 +111,7 @@
        }

    }



    public bool NeedUpdate()

    public bool NeedMaoErUpdate()

    {

        if (IsMaoErGame())

        {

@@ -118,8 +119,13 @@
        }

        else

        {

            return versionInfo.downAsset == 1 && versionInfo.VersionCount > 0;

            return false;

        }

    }



    public bool NeedNormalUpdate()

    {

        return versionInfo.downAsset == 1 && versionInfo.VersionCount > 0;

    }



    public string GetApkLocalUrl()

@@ -229,15 +235,19 @@
            step = Step.None;

            var tables = new Dictionary<string, string>();

            tables["uid"] = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;

            var url = StringUtility.Contact("https://api.maoergame.com/update/download/url?", HttpRequest.HashtablaToString(tables));

            Debug.Log("猫耳强更url：" + url);

            HttpRequest.Instance.RequestHttpPost(url, string.Empty, HttpRequest.defaultHttpContentType, 1, OnMaoErVersionCheckResult);

            var url = "https://api.maoergame.com/update/download/url";

            Debug.LogFormat("猫耳强更url：{0}  uid：{1} ", url, ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account);

            HttpRequest.Instance.RequestHttpPost(url, tables, HttpRequest.defaultHttpContentType, 1, OnMaoErVersionCheckResult);

        }

    }



    private void OnMaoErVersionCheckResult(bool ok, string result)

    {

        Debug.Log("猫耳强更 result：" + result);

        UTF8Encoding utf8 = new UTF8Encoding();

        Byte[] encodedBytes = utf8.GetBytes(result);

        String decodedString = utf8.GetString(encodedBytes);



        Debug.LogFormat("猫耳强更请求返回结果 result：{0}", decodedString);

        if (ok)

        {

            try


 System/Dogz/DogzActiveWin.cs

@@ -19,6 +19,7 @@
        [SerializeField] List<DogzUnEquip> m_DogzUnEquipBtns;

        [SerializeField] List<Text> m_PropertyTypes;

        [SerializeField] List<Text> m_PropertyValues;

        [SerializeField] List<Image> sliderImglist = new List<Image>();

        [SerializeField] Image m_DogzHeadIcon;

        [SerializeField] Text m_DogzAssistCnt;

        [SerializeField] Button m_AddAssistBtn;

@@ -103,6 +104,26 @@
            int jumpIndex = model.presentSelectDogz - 1 > 0 ? model.presentSelectDogz - 1 : 0;

            m_Controller.JumpIndex(jumpIndex);

        }



        private void SetDefalutDogzEquipState()

        {

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

            {

                ItemModel itemModel = null;

                bool isPut = model.TryGetDogzEquip(model.presentSelectDogz, model.GetDogzEquipPlaceByIndex(i), out itemModel);

                if (!isPut)

                {

                    sliderImglist[i].fillAmount = 0;

                    sliderImglist[i].gameObject.SetActive(false);

                }

                else

                {

                    sliderImglist[i].fillAmount = 1;

                    sliderImglist[i].gameObject.SetActive(true);

                }

            }

        }



        private void UpdateSelectDogzEvent()

        {

            m_Controller.m_Scorller.RefreshActiveCellViews();

@@ -110,6 +131,7 @@
            UpdateDogzEquip();

            UpdateDogzProperty();

            UpdateDogzBtn();

            SetDefalutDogzEquipState();

            assistBtnRedBehav.redpointId = model.GetDogzAssistRedpointById(model.presentSelectDogz).id;

        }

        private void UpdateDogzSkill()

@@ -154,7 +176,7 @@
            UpdateDogzEquip();

            UpdateDogzProperty();

            UpdateDogzBtn();



            SetDefalutDogzEquipState();

        }



        private void UpdateDogzEquip()


 System/Dogz/DogzModel.cs

@@ -501,6 +501,19 @@
            return false;

        }



        public Dictionary<int,bool> dogzEquipStateDict { get; private set; }

        public Dictionary<int,bool> GetDogzEquipPlaceStates(int _dogzId)

        {

            dogzEquipStateDict = new Dictionary<int, bool>();

            for(int i = 0; i < 5; i++)

            {

                int equipPlace = GetDogzEquipPlaceByIndex(i);

                ItemModel _equipData = null;

                dogzEquipStateDict.Add(i, TryGetDogzEquip(_dogzId,equipPlace,out _equipData));

            }

            return dogzEquipStateDict;

        }



        public void CheckPutOff(int equipPlace)

        {

            if (TryGetAssistDogzState(presentSelectDogz))

@@ -525,6 +538,7 @@
        {

            if (indexlist == null || indexlist.Count < 1) return;



            GetDogzEquipPlaceStates(presentSelectDogz);

            CA5C0_tagCMDogzEquipItem dogzPutOn = new CA5C0_tagCMDogzEquipItem();

            dogzPutOn.DogzID = (byte)presentSelectDogz;

            dogzPutOn.EquipIndexCount = (byte)indexlist.Count;

@@ -539,6 +553,7 @@


        private void SendPutOffEquip(int equipPlace)

        {

            GetDogzEquipPlaceStates(presentSelectDogz);

            CA5C1_tagCMDogzUnEquipItem dogzPutOff = new CA5C1_tagCMDogzUnEquipItem();

            dogzPutOff.DogzID = (byte)presentSelectDogz;

            dogzPutOff.EquipPlace = (byte)equipPlace;


 System/Dogz/DogzPackWin.cs

@@ -29,7 +29,7 @@
        [SerializeField] Transform starArrow;

        [SerializeField] SortTable qualitySort;

        [SerializeField] SortTable starSort;



        [SerializeField] List<Image> sliderImglist = new List<Image>();

        DogzModel m_DogzModel;

        DogzModel dogzModel

        {

@@ -47,6 +47,7 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzPackModel>());

            }

        }

        List<Image> curSliderImglist = new List<Image>();

        #region Built-in

        protected override void BindController()

        {

@@ -63,6 +64,7 @@


        protected override void OnPreOpen()

        {

            curSliderImglist.Clear();

            dogzModel.RefreshDogzEquipAct += RefreshDogzEquipEvent;

            playerPack.RefreshItemCountAct += RefreshDogzItemEvent;

            qualitySort.onSelectSortEvent += RefreshDogzSelectEvent;

@@ -76,6 +78,7 @@
            qualitySort.SetDefault();

            UpdateDogzEquip();

            UpdateDogzPack();

            SetDefalutDogzEquipState();

            starSort.gameObject.SetActive(false);

            qualitySort.gameObject.SetActive(false);

            starArrow.localRotation = Quaternion.Euler(0, 0, 180);

@@ -99,12 +102,27 @@
        protected override void OnAfterClose()

        {

        }



        protected override void LateUpdate()

        {

            if(curSliderImglist.Count > 0)

            {

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

                {

                    if(curSliderImglist[i].fillAmount < 1)

                    {

                        curSliderImglist[i].fillAmount += 0.1f;

                    }

                }

            }

        }

        #endregion



        private void RefreshDogzEquipEvent(int dogzId)

        {

            if (dogzId != dogzModel.presentSelectDogz) return;

            UpdateDogzEquip();

            UpdateDogzEquipState(dogzId);

        }



        private void UpdateDogzEquip()

@@ -136,6 +154,51 @@
            }

        }



        private void SetDefalutDogzEquipState()

        {

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

            {

                ItemModel itemModel = null;

                bool isPut = dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, dogzModel.GetDogzEquipPlaceByIndex(i), out itemModel);

                if (!isPut)

                {

                    sliderImglist[i].fillAmount = 0;

                    sliderImglist[i].gameObject.SetActive(false);

                }

                else

                {

                    sliderImglist[i].fillAmount = 1;

                    sliderImglist[i].gameObject.SetActive(true);

                }

            }

        }



        private void UpdateDogzEquipState(int dogzId)

        {

            curSliderImglist.Clear();

            foreach (var index in dogzModel.dogzEquipStateDict.Keys)

            {

                ItemModel itemModel = null;

                bool isPut = dogzModel.TryGetDogzEquip(dogzId,dogzModel.GetDogzEquipPlaceByIndex(index),out itemModel);

                if(!dogzModel.dogzEquipStateDict[index] && isPut)

                {

                    sliderImglist[index].gameObject.SetActive(true);

                    sliderImglist[index].fillAmount = 0;

                    curSliderImglist.Add(sliderImglist[index]);

                }

                else if(!isPut)

                {

                    sliderImglist[index].fillAmount = 0;

                    sliderImglist[index].gameObject.SetActive(false);

                }

                else

                {

                    sliderImglist[index].fillAmount = 1;

                    sliderImglist[index].gameObject.SetActive(true);

                }

            }

        }



        private void ClickEquipIndex(int index)

        {

            dogzModel.GetDogzItemListByIndex(dogzModel.presentSelectDogz,index);


 System/Login/LoginModel.cs

@@ -90,7 +90,7 @@
            SDKUtility.Instance.MakeKeyAndVisible();

            OperationLogCollect.Instance.RecordLauchEvent(5);



            if (VersionUtility.Instance.IsMaoErGame() && VersionUtility.Instance.NeedUpdate())

            if (VersionUtility.Instance.NeedMaoErUpdate())

            {

                VersionUtility.Instance.RequestMaoErVersionCheck();

            }


 System/OpenServerActivity/OpenServerActivityCell.cs

@@ -34,6 +34,8 @@
        public Image upArrow { get { return m_UpArrow; } }

        [SerializeField] Image m_TitleImg;

        public Image titleImage { get { return m_TitleImg; } }

        [SerializeField] UIEffect m_TitleEffect;

        public UIEffect titleEffect { get { return m_TitleEffect; } }



        private int m_Order = 0;

        public int order { get { return m_Order; } set { m_Order = value; } }


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -281,6 +281,12 @@
                _cell.titleImage.SetSprite(customActivity.titleIcon);

                _cell.titleImage.SetNativeSize();

            }

            _cell.titleEffect.StopImediatly();

            if (customActivity.titleEffectId != 0)

            {

                _cell.titleEffect.effect = customActivity.titleEffectId;

                _cell.titleEffect.Play();

            }



            if (_cell.order == 0 || _cell.order == 2)

            {

@@ -607,6 +613,7 @@
            [Header("活动类型"), EnumLabel(typeof(OpenServerActivityCenter.OSActivityType))]

            public OpenServerActivityCenter.OSActivityType activityType;

            public string titleIcon;

            public int titleEffectId;

        }

    }

}