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

client_Hale

2019-01-14 44b4cfd3443aae8b83b2a5ef9d6f0a058dfcae02

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -574,6 +574,7 @@
                        var sendInfo = new CA108_tagCMRefreshMainServerRole();

                        GameNetSystem.Instance.SendInfo(sendInfo);

                        baseData.MapID = baseData.mainServerMapIdRecord;

                        ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();

                        StageManager.Instance.Load<DungeonStage>(baseData.MapID, GameNetSystem.SocketType.CrossSever, true);

                        extersion.pkState = 0;

                    }


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs

@@ -61,12 +61,9 @@
            }

        }



        if (vNetData.socketType == GameNetSystem.SocketType.Main)

        if (mapInitOkEvent != null)

        {

            if (mapInitOkEvent != null)

            {

                mapInitOkEvent();

            }

            mapInitOkEvent();

        }



        //�е�ͼ����pk boss״̬

@@ -99,7 +96,7 @@
    {

        yield return WaitingForSecondConst.WaitMS500;



        if(PlayerDatas.Instance.hero == null)

        if (PlayerDatas.Instance.hero == null)

        {

            yield break;

        }


 Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA112_tagMCDBPlayer.cs

@@ -9,7 +9,7 @@

public class DTCA112_tagMCDBPlayer : DtcBasic
{

    public static event Action playerInitEvent;
    public override void Done(GameNetPackBasic vNetPack)
    {
        base.Done(vNetPack);
@@ -30,6 +30,11 @@
                hero.State = E_ActorState.Idle;
            }
        }

        if (playerInitEvent != null)

        {

            playerInitEvent();

        }
    }

}

 Fight/GameActor/GA_Guard.cs

@@ -94,6 +94,7 @@
        {
            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;
            DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent += AfterPlayerDataInitializeEvent;
            DTCA112_tagMCDBPlayer.playerInitEvent += PlayerInitEvent;
        }

        IsPlayerDie = false;
@@ -130,7 +131,8 @@
        deadModel.AllPlayerDieEvent -= AllPlayerDieEvent;
        deadModel.AllPlayerRebornEvent -= AllPlayerRebornEvent;
        DTC0429_tagObjResetPos.ResetPlayerPosEvent -= ResetPlayerPosEvent;

        DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent -= AfterPlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent -= AfterPlayerDataInitializeEvent;

        DTCA112_tagMCDBPlayer.playerInitEvent -= PlayerInitEvent;
        if (IsHeroControl)
        {
            StageManager.Instance.onStageLoadFinish -= OnStageLoadFinish;
@@ -158,9 +160,19 @@
        SnxxzGame.Instance.StartCoroutine(Co_RecheckPlayLifeState());

    }



    public void PlayerInitEvent()

    {

        CheckResetGuardState();

    }



    IEnumerator Co_RecheckPlayLifeState()

    {

        yield return null;

        CheckResetGuardState();

    }



    void CheckResetGuardState()

    {

        if (guardState == GuardState.Inter)

        {

            var hero = PlayerDatas.Instance.hero;


 System/Chat/ChatWin.cs

@@ -45,6 +45,11 @@


        protected override void OnPreOpen()

        {

            if (!IsSatisfyShowChannel(ChatCtrl.Inst.presentChatType))

            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.System;

            }



            m_ChatSend.parent = this;

            ChatCtrl.Inst.lockUpdate = false;

            ChatCtrl.Inst.OnPteChatChangeEvent += OnPteChatChangeEvent;

@@ -97,7 +102,10 @@
                m_ChannelControl.Refresh();

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

                {

                    m_ChannelControl.AddCell(ScrollerDataType.Normal, (int)chatCenter.chatChannels[i], OnChannelSelect);

                    if (IsSatisfyShowChannel(chatCenter.chatChannels[i]))

                    {

                        m_ChannelControl.AddCell(ScrollerDataType.Normal, (int)chatCenter.chatChannels[i], OnChannelSelect);

                    }

                }

                m_ChannelControl.Restart();

            }

@@ -107,6 +115,18 @@
            }

        }



        private bool IsSatisfyShowChannel(ChatInfoType channel)

        {

            if (CrossServerUtility.IsCrossServer())

            {

                if (channel == ChatInfoType.Team || channel == ChatInfoType.Invite)

                {

                    return false;

                }

            }

            return true;

        }



        private void OnPteChatChangeEvent()

        {

            if (ChatCtrl.Inst.presentChatType == ChatInfoType.Friend)


 System/CrossServerBoss/CrossServerBossModel.cs

@@ -8,7 +8,7 @@
{
    [XLua.Hotfix]
    [XLua.LuaCallCSharp]
    public class CrossServerBossModel : Model
    public class CrossServerBossModel : Model, IMapInitOk
    {
        public const int DATA_MAPID = 32020;
        public const int REDPOINT = 77002;
@@ -90,6 +90,17 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange;
        }

        public void OnMapInitOk()
        {
            if (PlayerDatas.Instance.baseData.MapID == DATA_MAPID)
            {
                if (selectedBoss != 0)
                {
                    MapTransferUtility.Instance.MoveToNPC(selectedBoss);
                }
            }
        }

        public void RequestEnter()
        {
            var sendInfo = new CC105_tagCMEnterCrossServer();

 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -147,6 +147,11 @@
            {

                return;

            }

            if (dungeonModel.mission.roundNum == 1 && DateTime.Now >= dungeonEndTime)

            {

                m_CountdownText.text = "60";

                return;

            }

            if (DateTime.Now >= dungeonEndTime)

            {

                m_CountdownText.text = "0";


 System/DailyQuest/DailyQuestRewardPreviewWin.cs

@@ -110,6 +110,7 @@
                var nextStageRealm = stageNeedLevels[realNextStage];
                var nextStageRealmConfig = Config.Instance.Get<RealmConfig>(nextStageRealm);
                m_NextStageRealm.SetSprite(nextStageRealmConfig.Img);
                m_NextStageRealm.SetNativeSize();
                m_NextStageContainer.gameObject.SetActive(true);

                if (model.currentRewardStageIndex == nextRealmStage)

 System/FairyAu/FairyFeastTransmitShow.cs

@@ -373,16 +373,19 @@
                        {

                            secondaryResId = clothes + 2900;

                        }

                        else

                        {

                            secondaryResId = jobConfig.BaseEquip[2];

                        }

                    }

                }

                else

                {

                    var item = Config.Instance.Get<ItemConfig>(secondaryId);

                    secondaryResId = item == null ? jobConfig.BaseEquip[2] : item.ChangeOrd;

                    if (item != null)

                    {

                        secondaryResId = item.ChangeOrd;

                    }

                }

                if (secondaryResId == 0)

                {

                    secondaryResId = jobConfig.BaseEquip[2];

                }

                PutOnSecondary(secondaryResId);




 System/FairyAu/FairyMemberCell.cs

@@ -30,7 +30,6 @@
        [SerializeField] Text m_TimeTxt;

        [SerializeField] Text m_ContributeTxt;

        [SerializeField] Image m_RealmImg;

        [SerializeField] Image m_OnlineImg;

        [SerializeField] Button m_AllotBtn;



        public override void Refresh(CellView cell)

@@ -54,7 +53,6 @@
            else {

                m_RealmImg.gameObject.SetActive(false);

            }

            m_OnlineImg.gameObject.SetActive(false);

            m_LvTxt.text = model.sortFairyMembers[index].LV.ToString();

            m_DutyTxt.text = Language.Get(string.Format("L102{0}", fairyMember.FamilyLV + 1));

            m_ContributeTxt.text = fairyMember.FamilyActiveValue.ToString();


 System/FairyAu/FairyViewCell.cs

@@ -56,6 +56,7 @@
                if (presentCfg != null)

                {

                    m_RealmImg.SetSprite(presentCfg.Img);

                    m_RealmImg.SetNativeSize();

                }

            }

            m_FairyLvTxt.text = fakeFairy ? "1" : fairy.FamilyLV.ToString();


 System/Realm/RealmBossShow.cs

@@ -235,16 +235,19 @@
                    {

                        secondaryResId = clothesId + 2900;

                    }

                    else

                    {

                        secondaryResId = jobConfig.BaseEquip[2];

                    }

                }

            }

            else

            {

                var item = Config.Instance.Get<ItemConfig>(secondaryId);

                secondaryResId = item == null ? jobConfig.BaseEquip[2] : item.ChangeOrd;

                if (item != null)

                {

                    secondaryResId = item.ChangeOrd;

                }

            }

            if (secondaryResId == 0)

            {

                secondaryResId = jobConfig.BaseEquip[2];

            }

            PutOnSecondary(job, secondaryResId);




 System/Role/GodWeaponPreviewWin.cs

@@ -97,7 +97,17 @@
        void Display()

        {

            var defaultStage = model.GetGodWeaponStage(selectGodWeaponType);

            defaultStage = Mathf.Clamp(defaultStage + 1, 1, 3);

            var level = 0;

            if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, selectGodWeaponType, out level))

            {

                var _stage = 0;

                if (model.TryGetGodWeaponStage(selectGodWeaponType, level, out _stage))

                {

                    defaultStage = _stage;

                }

            }



            defaultStage = Mathf.Clamp(defaultStage, 1, 3);

            OnSelectStage(defaultStage);

            DisplayEquip();

        }


 System/Role/MagicianModel.cs

@@ -318,7 +318,7 @@
        }



        #region 红点

        public const int MAGICAIN_REDPOINT = 10104;

        public const int MAGICAIN_REDPOINT = 10103;

        public const int MAGICAIN_INTERVAL = 100;

        public Dictionary<int, Redpoint> redpointDict = new Dictionary<int, Redpoint>();

        Redpoint magicianPoint = new Redpoint(101, MAGICAIN_REDPOINT);


 UI/Common/ButtonClickInterval.cs

New file
@@ -0,0 +1,31 @@
using System;

using UnityEngine;

using UnityEngine.UI;

using System.Collections;



namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class ButtonClickInterval : MonoBehaviour

    {

        [SerializeField] float interval = 1f;

        [SerializeField] Button targetBtn;



        private void Awake()

        {

            targetBtn.AddListener(OnClick);

        }



        private void OnClick()

        {

            targetBtn.enabled = false;

            StartCoroutine(DelayClick());

        }



        IEnumerator DelayClick()

        {

            yield return new WaitForSeconds(interval);

            targetBtn.enabled = true;

        }

    }

}


 UI/Common/ButtonClickInterval.cs.meta

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

 UI/Common/UI3DShowHero.cs

@@ -79,16 +79,20 @@
                    {

                        secondaryResId = this.clothesId + 2900;

                    }

                    else

                    {

                        secondaryResId = jobConfig.BaseEquip[2];

                    }

                }

            }

            else

            {

                var item = Config.Instance.Get<ItemConfig>(secondaryId);

                secondaryResId = item == null ? jobConfig.BaseEquip[2] : item.ChangeOrd;

                if (item != null)

                {

                    secondaryResId = item.ChangeOrd;

                }

            }



            if (secondaryResId == 0)

            {

                secondaryResId = jobConfig.BaseEquip[2];

            }



            PutOnSecondary(job, secondaryResId);