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

client_Hale

2018-09-11 f237dce65b7eb454dfc9e2fe6c8efdebca085b4e

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

 Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs

@@ -7,6 +7,7 @@
{

    public uint Point;    // 复活点数

    public uint TotalPoint;    // 复活总点数

    public ushort RebornCnt;    // 复活次数



    public HAC08_tagGCBossRebornPoint()

    {

@@ -17,6 +18,7 @@
    {

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

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

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

    }



}

 System/BossReborn/BossRebornModel.cs

@@ -29,17 +29,31 @@
            set { m_BossRebornInderalTotal = value; }
        }

        int m_BossRebornCount = -1;
        public int bossRebornCount {
            get { return m_BossRebornCount; }
            set {
                if (m_BossRebornCount != value)
                {
                    m_BossRebornCount = value;
                    if (bossRebornCountEvent != null)
                    {
                        bossRebornCountEvent();
                    }
                }
            }
        }

        public int surplusSecond { get { return OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.BossReborn); } }

        public bool priorityOpen
        {
            get
            {
        public bool priorityOpen {
            get {
                return bossRebornPoint.state == RedPointState.GetReward;
            }
        }

        public event Action bossRebornIntergralEvent;
        public event Action bossRebornCountEvent;
        public event Action<int> bossTaskStateChangeEvent;
        public event Action<int> onStateUpate;

@@ -83,10 +97,8 @@
            }
        }

        public bool IsOpen
        {
            get
            {
        public bool IsOpen {
            get {
                return OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.BossReborn);
            }
        }

 System/BossReborn/BossRebornWin.cs

@@ -19,6 +19,7 @@
        [SerializeField] Slider m_Slider;

        [SerializeField] Text m_Progress;

        [SerializeField] Text m_Time;

        [SerializeField] Text m_RebornCount;

        [SerializeField] CyclicScroll m_TaskScroll;



        BossRebornModel model { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }

@@ -38,12 +39,14 @@
            m_Description.text = Language.Get("BossFHLanguage7", model.bossRebornIndegralTotal);

            UpdateIntegral();

            UpdateCountDown();

            UpdateRebornCount();

        }



        protected override void OnAfterOpen()

        {

            model.bossTaskStateChangeEvent += OnTaskStateChange;

            model.bossRebornIntergralEvent += UpdateIntegral;

            model.bossRebornCountEvent += UpdateRebornCount;

            GlobalTimeEvent.Instance.secondEvent += OnPerSecond;

        }



@@ -51,6 +54,7 @@
        {

            model.bossTaskStateChangeEvent -= OnTaskStateChange;

            model.bossRebornIntergralEvent -= UpdateIntegral;

            model.bossRebornCountEvent -= UpdateRebornCount;

            GlobalTimeEvent.Instance.secondEvent -= OnPerSecond;

        }



@@ -84,6 +88,11 @@
            m_Time.text = Language.Get("BossFHLanguage2", TimeUtility.SecondsToDHMSCHS(model.surplusSecond));

        }



        private void UpdateRebornCount()

        {

            m_RebornCount.text = Language.Get("BossRebornTimes", model.bossRebornCount);

        }



        private void OnTaskStateChange(int _id)

        {

            UpdateActivities();


 System/MainInterfacePanel/TaskListTip.cs

@@ -338,12 +338,26 @@
            TaskScheduling();

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !inDungeon)

            {

                TheTaskToGenerate();//任务列表需要重新排列重新刷新赋值

               // LodingDelTask(_IdTask);

                DeleteSort(_IdTask);

            }

           

        }



        private void DeleteSort(int taskID)//关于任务删除

        {

            for (int i = 0; i < Content.childCount; i++)

            {

                GameObject obj = Content.GetChild(i).gameObject;

                TaskType taskType = obj.GetComponent<TaskType>();

                if (obj.activeSelf && taskType.TaskID == taskID)

                {

                    taskType.TaskID = 0;

                    taskType.ClearTaskName();

                    obj.SetActive(false);

                    obj.transform.SetAsLastSibling();                   
                }

            }

        }



        void TaskInformation(int _Taskid, Dictionary<int, Dictionary<string, string>> _Dic)//任务字典信息

        {


 System/Team/TeamInvitationBehaviour.cs

@@ -8,26 +8,18 @@
{

    public class TeamInvitationBehaviour : ScrollItem

    {

        [SerializeField]

        Image m_Realm;

        [SerializeField]

        Text m_PlayerName;



        [SerializeField]

        Text m_Job;

        [SerializeField]

        Image m_LevelSign;

        [SerializeField]

        Text m_Level;

        [SerializeField] Image m_Realm;

        [SerializeField] Text m_PlayerName;

        [SerializeField] Text m_Job;

        [SerializeField] Text m_Mission;

        [SerializeField] Image m_LevelSign;

        [SerializeField] Text m_Level;

        [SerializeField] Button m_Select;

        [SerializeField] Image m_Selected;



        [SerializeField]

        Button m_Select;



        [SerializeField]

        Image m_Selected;



        TeamModel m_Model;

        TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }

        TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        TeamInvitation invitation;

        public override void Display(object _data)

@@ -51,6 +43,19 @@
            m_LevelSign.gameObject.SetActive(isNirvanaLevel);

            m_Level.text = isNirvanaLevel ? (invitation.level - GeneralConfig.Instance.greatMasterStartLV).ToString() : invitation.level.ToString();



            var mission = invitation.mission;

            var targetConfig = Config.Instance.Get<TeamTargetConfig>(mission.mapId);

            if (targetConfig != null)

            {

                var dungeonId = dungeonModel.GetDungeonId(mission.mapId, mission.mapEx);

                var config = Config.Instance.Get<DungeonConfig>(dungeonId);

                m_Mission.text = config.FBName;

            }

            else

            {

                m_Mission.text = Language.Get("RightHereMap");

            }



            m_Selected.gameObject.SetActive(invitation.playerId == model.currentSelectedInvitation);



            m_Select.RemoveAllListeners();


 System/Team/TeamInvitationWin.cs

@@ -14,15 +14,12 @@

    public class TeamInvitationWin : Window
    {
        [SerializeField]
        CyclicScroll m_InvitationScroll;
        [SerializeField]
        Button m_Close;
        [SerializeField]
        Button m_Confirm;

        TeamModel m_Model;
        TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
        [SerializeField] CyclicScroll m_InvitationScroll;
        [SerializeField] Button m_Close;
        [SerializeField] Button m_Confirm;

        TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

        #region Built-in
        protected override void BindController()
@@ -55,7 +52,6 @@
        }

        #endregion


        private void ShowInvitations()
        {