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

client_Zxw

2018-11-19 4aee43a88862426a36d38a957e443c3513ff818a

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

 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA333_tagMCDailyActivityInfoList.cs

@@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Snxxz.UI;
@@ -6,11 +6,14 @@
public class DTCA333_tagMCDailyActivityInfoList : DtcBasic
{
    DailyQuestModel model { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
    MultipleRealmPointModel realmPointModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }

    public override void Done(GameNetPackBasic vNetPack)
    {
        base.Done(vNetPack);
        model.OnDailyQuestActiveValueInfoUpdate(vNetPack as HA333_tagMCDailyActivityInfoList);
        base.Done(vNetPack);

        HA333_tagMCDailyActivityInfoList vNetData = vNetPack as HA333_tagMCDailyActivityInfoList;
        model.OnDailyQuestActiveValueInfoUpdate(vNetData);
        realmPointModel.SetAlreadyRealmPoint((int)vNetData.ExtraPoint);
    }

}

 Core/NetworkPackage/ServerPack/HA3_Function/HA333_tagMCDailyActivityInfoList.cs

@@ -1,26 +1,25 @@
using UnityEngine;
using System.Collections;

//A3 33 玩家每日活跃度 #tagMCDailyActivityInfoList

public class HA333_tagMCDailyActivityInfoList : GameNetPackBasic
{
    public uint CurValue;    // 当前总活跃度
    public uint RealmPoint;    // 可领取修行点
    public byte StageIndex;    // 当前阶段索引
    public uint AwardRecord;    // 领奖记录 按位存储

    public HA333_tagMCDailyActivityInfoList()
    {
        _cmd = (ushort)0xA333;
    }

    public override void ReadFromBytes(byte[] vBytes)
    {
        TransBytes(out CurValue, vBytes, NetDataType.DWORD);
        TransBytes(out RealmPoint, vBytes, NetDataType.DWORD);
        TransBytes(out StageIndex, vBytes, NetDataType.BYTE);
        TransBytes(out AwardRecord, vBytes, NetDataType.DWORD);
    }

}
using UnityEngine;

using System.Collections;



//A3 33 玩家每日活跃度 #tagMCDailyActivityInfoList



public class HA333_tagMCDailyActivityInfoList : GameNetPackBasic {

    public uint CurValue;    // 当前总活跃度

    public uint RealmPoint;    // 可领取修行点

    public byte StageIndex;    // 当前阶段索引

    public uint AwardRecord;    // 领奖记录 按位存储

    public uint ExtraPoint;    // 多倍活动获得的额外修行点



    public HA333_tagMCDailyActivityInfoList () {

        _cmd = (ushort)0xA333;

    }



    public override void ReadFromBytes (byte[] vBytes) {

        TransBytes (out CurValue, vBytes, NetDataType.DWORD);

        TransBytes (out RealmPoint, vBytes, NetDataType.DWORD);

        TransBytes (out StageIndex, vBytes, NetDataType.BYTE);

        TransBytes (out AwardRecord, vBytes, NetDataType.DWORD);

        TransBytes (out ExtraPoint, vBytes, NetDataType.DWORD);

    }



}


 Core/NetworkPackage/ServerPack/HAC_Activity/HAC0A_tagGCMultiRealmPointInfo.cs

@@ -8,6 +8,7 @@
    public string EndtDate;    // 结束日期 y-m-d


    public byte Multiple;    // 倍数


    public ushort LimitLV;    // 限制等级


    public uint LimitPoint;    // 限制获得修行点




    public HAC0A_tagGCMultiRealmPointInfo () {


        _cmd = (ushort)0xAC0A;


@@ -18,6 +19,7 @@
        TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10);


        TransBytes (out Multiple, vBytes, NetDataType.BYTE);


        TransBytes (out LimitLV, vBytes, NetDataType.WORD);


        TransBytes (out LimitPoint, vBytes, NetDataType.DWORD);

    }





}



 System/Chat/ChatCtrl.cs

@@ -997,7 +997,7 @@
    }



    public bool needCheckAssitChat { get; set; }

    int IsAssitChat(string message, bool force = false)

    public int IsAssitChat(string message, bool force = false)

    {

        int assitChat = 0;

        if (needCheckAssitChat || force)


 System/Chat/ChatSendComponent.cs

@@ -104,6 +104,10 @@
            {

                return;

            }

            if (m_OnChating)

            {

                return;

            }

            if (!chatCenter.clientBanned)

            {

                CheckRepeatContent(m_ChatInput.text);

@@ -112,10 +116,6 @@
            if (CheckChatCD())

            {

                SysNotifyMgr.Instance.ShowTip("OnChatCD");

                return;

            }

            if (m_OnChating)

            {

                return;

            }

            m_OnChating = true;

@@ -252,7 +252,7 @@
        static DateTime repeatTime = DateTime.Now;

        private void CheckRepeatContent(string _content)

        {

            if (repeatChatContent.Equals(_content)

            if (ChatCtrl.Inst.IsAssitChat(_content, true) == 0 && repeatChatContent.Equals(_content)

                && (TimeUtility.ServerNow - repeatTime).TotalSeconds < chatCenter.banCheckSecond)

            {

                repeatChatCount++;

@@ -278,7 +278,7 @@
                && maliceChatCount > 0 && maliceRecordCount < chatCenter.maliceCheckCount)

            {

                maliceRecordCount++;

                if (_content.Length == 1)

                if (ChatCtrl.GetUTF8InfoLen(_content) == 1)

                {

                    maliceChatCount++;

                }

@@ -289,7 +289,7 @@
            }

            else

            {

                if (_content.Length == 1)

                if (ChatCtrl.GetUTF8InfoLen(_content) == 1)

                {

                    maliceChatCount = 1;

                    maliceRecordCount = 1;


 System/Role/GodWeaponCell.cs

@@ -35,7 +35,12 @@
            m_Level.text = StringUtility.Contact(godWeaponInfo.level, Language.Get("L1047"));

            m_ContainerUnlock.gameObject.SetActive(godWeaponInfo == null || godWeaponInfo.level < 1);

            m_Redpoint.redpointId = MagicianModel.MAGICAIN_REDPOINT * MagicianModel.MAGICAIN_INTERVAL + _type;

            m_Condition.text = Language.Get("MagicWin_1");



            if (!model.IsGodWeaponUnlock(_type))

            {

                bool satisfyCondition = model.ContainsCondition(_type) && model.SatisfyUnlockCondition(_type);

                m_Condition.text = satisfyCondition ? Language.Get("GodWeaponUnActive") : Language.Get("MagicWin_1");

            }

            if (model.godWeaponIcons.ContainsKey(_type))

            {

                m_Icon.SetSprite(model.godWeaponIcons[_type]);


 System/Role/GodWeaponPreviewWin.cs

@@ -42,7 +42,10 @@
                var index = i + 1;

                m_SelectStages[i].AddListener(() =>

                {

                    OnSelectStage(index);

                    if (selectStage != index)

                    {

                        OnSelectStage(index);

                    }

                });

            }

        }


 System/Welfare/MultipleRealmPointModel.cs

@@ -21,6 +21,7 @@


        public void OnBeforePlayerDataInitialize()

        {

            alreadyRealmPoint = 0;

            isNewDay = false;

        }



@@ -69,6 +70,17 @@
            }

        }



        public event Action UpdateRealmPointEvent;

        public int alreadyRealmPoint { get; private set; }

        public void SetAlreadyRealmPoint(int point)

        {

            alreadyRealmPoint = point;

            if(UpdateRealmPointEvent != null)

            {

                UpdateRealmPointEvent();

            }

        }



        private void CheckReconnect()

        {

            if (!(StageManager.Instance.CurrentStage is DungeonStage))


 System/Welfare/NPracticePointWin.cs

@@ -12,6 +12,7 @@
        [SerializeField] Image multipleRealmImg;

        [SerializeField] Image multipleRealmImg2;

        [SerializeField] Text activeRuleText;

        [SerializeField] Text getRealmPointText;

        OperationBase operation;

        MultipleRealmPointModel multipleRealm { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }

        protected override void BindController()

@@ -28,6 +29,7 @@
        {

            multipleRealm.CheckShowRed(true);

            GlobalTimeEvent.Instance.secondEvent += RefreshSecond;

            multipleRealm.UpdateRealmPointEvent += UpdateRealmPoint;

            InitUI();

        }

        protected override void OnAfterOpen()

@@ -38,6 +40,7 @@
        protected override void OnPreClose()

        {

            GlobalTimeEvent.Instance.secondEvent -= RefreshSecond;

            multipleRealm.UpdateRealmPointEvent -= UpdateRealmPoint;

        }



        protected override void OnAfterClose()

@@ -60,7 +63,7 @@
                }

                activeRuleText.text = Language.Get("MultipleXXDRemind", Language.Get(StringUtility.Contact("Num_CHS_",multipleRealm)));

            }

            
            UpdateRealmPoint();

        }



        private void ClickGotoBtn()

@@ -86,5 +89,14 @@
            }

          

        }



        private void UpdateRealmPoint()

        {

            if (operation == null) return;



            int limitRealmPoint = (operation as OperationMultipleRealmPoint).limitRealmPoint;

            string realmPointStr = StringUtility.Contact(multipleRealm.alreadyRealmPoint,"/",limitRealmPoint);

            getRealmPointText.text = Language.Get("RealmPractice115",realmPointStr);

        }

    }

}


 System/Welfare/OperationMultipleRealmPoint.cs

@@ -7,6 +7,7 @@
    public class OperationMultipleRealmPoint : OperationBase

    {

        public int multiplePractice; //倍数

        public int limitRealmPoint; //获得修行点上限

        public int startHour = 5;

        public int startMinute = 0;

        public int startSecond = 0;


 System/Welfare/OperationTimeHepler.cs

@@ -488,7 +488,9 @@
                operation.startDate = ParseOperationDate(package.StartDate);

                operation.endDate = ParseOperationDate(package.EndtDate);

                operation.limitLv = package.LimitLV;

                (operation as OperationMultipleRealmPoint).multiplePractice = package.Multiple;

                var multipleRealmPoint = operation as OperationMultipleRealmPoint;

                multipleRealmPoint.limitRealmPoint = (int)package.LimitPoint;

                multipleRealmPoint.multiplePractice = package.Multiple;

                if (operationTimeUpdateEvent != null)

                {

                    operationTimeUpdateEvent(Operation.MultipRealmPoint);