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

client_Hale

2018-08-31 601a7f468d65a303ba6c0bdb6169322c1badba42

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

 System/DailyQuest/DailyQuestModel.cs

@@ -30,26 +30,31 @@
        public Redpoint trialExchangeRedpoint = new Redpoint(EVERYDAY_REDPOINTID, TRIALEXCHANGE_REDPOINTID);



        int m_DailyQuestTotalActiveValue = 150;

        public int dailyQuestTotalActiveValue {

        public int dailyQuestTotalActiveValue

        {

            get { return m_DailyQuestTotalActiveValue; }

        }



        int m_CurrentDailyQuest = 0;

        public int currentDailyQuest {

        public int currentDailyQuest

        {

            get { return this.m_CurrentDailyQuest; }

            set { this.m_CurrentDailyQuest = value; }

        }



        int m_CurrentRewardStageIndex = 0;

        public int currentRewardStageIndex {

        public int currentRewardStageIndex

        {

            get { return m_CurrentRewardStageIndex; }

            private set { m_CurrentRewardStageIndex = value; }

        }



        int m_TotalActiveValue = 0;

        public int totalActiveValue {

        public int totalActiveValue

        {

            get { return m_TotalActiveValue; }

            private set {

            private set

            {

                if (m_TotalActiveValue != value)

                {

                    m_TotalActiveValue = value;

@@ -63,9 +68,11 @@
        }



        int m_GotableRealmPoint;

        public int gotableRealmPoint {

        public int gotableRealmPoint

        {

            get { return m_GotableRealmPoint; }

            private set {

            private set

            {

                if (m_GotableRealmPoint != value)

                {

                    m_GotableRealmPoint = value;

@@ -566,12 +573,12 @@
                        }

                        else

                        {

                            var completedTimes = GetDailyQuestCompletedTimes(dailyQuest.id);

                            var totalTimes = GetDailyQuestTotalTimes(dailyQuest.id);

                            switch ((DailyQuestType)_questId)

                            {

                                case DailyQuestType.HeavenBattle:

                                case DailyQuestType.FairyFeast:

                                    var completedTimes = GetDailyQuestCompletedTimes(dailyQuest.id);

                                    var totalTimes = GetDailyQuestTotalTimes(dailyQuest.id);

                                    if (dailyQuestState == DailyQuestState.CanBuyTimes || (dailyQuestState == DailyQuestState.Normal && completedTimes < totalTimes))

                                    {

                                        dailyQuest.redpoint.state = RedPointState.Simple;

@@ -591,6 +598,9 @@
                                    {

                                        dailyQuest.redpoint.state = RedPointState.None;

                                    }

                                    break;

                                case DailyQuestType.FairyGrabBoss:

                                    dailyQuest.redpoint.state = completedTimes >= totalTimes ? RedPointState.Simple : RedPointState.None;

                                    break;

                                default:

                                    if (dailyQuestState == DailyQuestState.CanBuyTimes || dailyQuestState == DailyQuestState.Normal)

@@ -857,7 +867,7 @@
        {

            var type = (DailyQuestType)_dailyQuestId;

            var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

            if (type == DailyQuestType.FairyFeast || type == DailyQuestType.FairyLeague || type == DailyQuestType.FairyTask)

            if (type == DailyQuestType.FairyFeast || type == DailyQuestType.FairyLeague || type == DailyQuestType.FairyTask || type == DailyQuestType.FairyGrabBoss)

            {

                if (PlayerDatas.Instance.fairyData.HasFairy)

                {


 System/FairyAu/FairyGrabBossHintWin.cs

@@ -25,6 +25,9 @@
        float m_Timer = 0f;

        const float Interval = 10f;



        float m_DieTimer = 0f;

        const float DieCloseDuration = 15f;



        int bossId = 0;

        uint objId = 0;



@@ -44,6 +47,7 @@
        protected override void OnPreOpen()

        {

            m_Timer = 0f;

            m_DieTimer = 0f;

            var list = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcFightBoss);

            bossId = 0;

            if (list != null)

@@ -97,10 +101,26 @@
        protected override void LateUpdate()

        {

            base.LateUpdate();



            if (CheckBossDie())

            {

                m_DieTimer += Time.deltaTime;

                if (m_DieTimer >= DieCloseDuration)

                {

                    CloseImmediately();

                    model.RecheckGrabBoss();

                    return;

                }

            }



            m_Timer += Time.deltaTime;

            if (m_Timer >= Interval && bossId != 0)

            {

                m_Timer = 0f;

                if (CheckBossDie())

                {

                    return;

                }

                model.QueryGrabBossHurt(bossId, 0, objId);

            }

        }

@@ -144,6 +164,10 @@
                    }

                }

            }

            if (currentHp <= 0)

            {

                return;

            }

            for (int i = index; i < m_RankBehaviours.Length; i++)

            {

                m_RankBehaviours[i].Display(string.Empty, 0);

@@ -178,9 +202,40 @@
                currentHp = hp;

                totalHp = _totalHp;

                DisplayProgress();

                if (currentHp > 0)

                {

                    m_DieTimer = 0f;

                }

            }

        }



        bool CheckBossDie()

        {

            bool hasBoss = false;

            var list = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcFightBoss);

            if (list != null)

            {

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

                {

                    GA_NpcFightBoss bossActor = list[i] as GA_NpcFightBoss;

                    if (bossActor != null && model.bosses.Contains(bossActor.NpcConfig.NPCID))

                    {

                        hasBoss = true;

                        break;

                    }

                }

            }

            if (!hasBoss)

            {

                currentHp = 0;

            }

            if (currentHp == 0 && !m_ContainerKilled.gameObject.activeSelf)

            {

                DisplayProgress();

            }

            return bossId == 0 || currentHp <= 0;

        }



        private void SecondEvent()

        {

            DisplayTimer();


 System/FairyAu/FairyGrabBossModel.cs

@@ -83,6 +83,7 @@
        public event Action<int> bossSelectedEvent;

        public event Action<int, int> bossHurtUpdate;

        public event Action<int> bossProgressUpdate;

        public event Action bossAllProgressUpdate;

        public event Action bossGrabHintEvent;



        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

@@ -98,7 +99,7 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            GA_Hero.OnEnterOrExitArea += OnEnterOrExitArea;

            GAMgr.Instance.OnFightNpcRequest += OnFightNpcUpdate;

            GAMgr.Instance.OnFightNpcRelease += OnFightNpcUpdate;

            //GAMgr.Instance.OnFightNpcRelease += OnFightNpcUpdate;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

        }



@@ -118,7 +119,7 @@
            DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState;

            GA_Hero.OnEnterOrExitArea -= OnEnterOrExitArea;

            GAMgr.Instance.OnFightNpcRequest -= OnFightNpcUpdate;

            GAMgr.Instance.OnFightNpcRelease -= OnFightNpcUpdate;

            //GAMgr.Instance.OnFightNpcRelease -= OnFightNpcUpdate;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;

        }



@@ -353,6 +354,10 @@
                    bossProgressUpdate(bossProgress.NPCID);

                }

            }

            if (bossAllProgressUpdate != null)

            {

                bossAllProgressUpdate();

            }

        }



        public bool TryGetBossProgress(int bossId,out BossProgressInfo bossProgressInfo)


 System/FairyAu/FairyGrabBossWin.cs

@@ -54,6 +54,7 @@
            GlobalTimeEvent.Instance.secondEvent += SecondEvent;

            model.bossSelectedEvent += BossSelectedEvent;

            model.bossProgressUpdate += BossProgressUpdate;

            model.bossAllProgressUpdate += BossAllProgressUpdate;

            model.stateUpdate += StateUpdate;

            m_Timer = 0;

        }

@@ -76,6 +77,7 @@
            GlobalTimeEvent.Instance.secondEvent -= SecondEvent;

            model.bossSelectedEvent -= BossSelectedEvent;

            model.bossProgressUpdate -= BossProgressUpdate;

            model.bossAllProgressUpdate -= BossAllProgressUpdate;

            model.stateUpdate -= StateUpdate;

        }



@@ -211,15 +213,20 @@


        private void BossProgressUpdate(int bossId)

        {

            if (!autoSelect)

            {

                AutoSelect();

            }

            if (bossId == model.selectBoss)

            {

                DisplayHighestFairy();

            }

        }



        void BossAllProgressUpdate()

        {

            if (!autoSelect)

            {

                AutoSelect();

            }

        }



        private void StateUpdate()

        {

            DisplayHighestFairy();


 System/HttpRequest/HttpBehaviour.cs

@@ -1,11 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using System;

using System.Net;

using System.Text;
using System.IO;

using System.Text;

using System.IO;



public class HttpBehaviour : MonoBehaviour

{



@@ -122,14 +122,25 @@


        if (getResult)

        {

            if (callBack != null)

            try

            {

                callBack(ok, message);

                callBack = null;

                DebugEx.LogFormat("Http 数据通信 {0},请求数据结果：{1},内容：{2}", this.url, ok, message);



                if (callBack != null)

                {

                    callBack(ok, message);

                }

            }

            catch (Exception ex)

            {

                Debug.Log(ex);

            }

            finally

            {

                callBack = null;

                Destroy(this.gameObject);

            }



            Destroy(this.gameObject);

        }

    }



@@ -194,5 +205,5 @@
        }

    }




}


}


 System/MainInterfacePanel/CombatModeWin.cs

@@ -50,7 +50,15 @@
        {
            int MapID = PlayerDatas.Instance.baseData.MapID;
            var config = Config.Instance.Get<MapConfig>(MapID);

            AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();

            if (fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且在活动区域

            {

                AtkTypeList = new int[] { 0, 5 };

            }

            else

            {

                AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();

            }



            _PkType = Buffmodel.PkType;//获取当前PK状态
            if (_PkType != 2)
            {

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -1054,9 +1054,19 @@
            IsShowTaskPanel();

            int mapID = PlayerDatas.Instance.baseData.MapID;

            var config = Config.Instance.Get<MapConfig>(mapID);

            if (!fairyGrabBossModel.grabBossHintOpen && Buffmodel.PkType != config.Camp)

            if (fairyGrabBossModel.grabBossHintOpen)

            {

                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);

                if (Buffmodel.PkType != config.Camp)

                {

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);

                }

            }

            else

            {

                if (Buffmodel.PkType != config.Camp)

                {

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);

                }

            }

        }

    }


 UI/Common/WindowConfig.cs

@@ -1,17 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;

[CreateAssetMenu(menuName = "Config/WindowConfig")]
using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using System;



[CreateAssetMenu(menuName = "Config/WindowConfig")]

public class WindowConfig : ScriptableObject

{

{



    public WindowTable[] windows;

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

    static WindowConfig config;


    [NonSerialized] public Dictionary<string, List<string>> parentChildrenTable = new Dictionary<string, List<string>>();

    [NonSerialized] public List<string> childWindows = new List<string>();



    static WindowConfig config;

    public static WindowConfig Get()

    {

        if (config == null)

@@ -31,8 +32,8 @@
        }



        return config;

    }

    }



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

    {

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

@@ -53,8 +54,8 @@


        _child = string.Empty;

        return false;

    }

    }



    public bool FindParentWindow(string _child, out string _parent)

    {

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

@@ -73,8 +74,8 @@


        _parent = string.Empty;

        return false;

    }

    }



    public List<string> FindChildWindows(string _parent)

    {

        if (parentChildrenTable.ContainsKey(_parent))

@@ -85,25 +86,25 @@
        {

            return null;

        }

    }

    }



    public bool IsChildWindow(string _name)

    {

        return childWindows.Contains(_name);

    }

    [Serializable]
    }



    [Serializable]

    public struct WindowTable

    {

        public string parent;

        public OrderTable[] orderTables;

    }

    [Serializable]
    }



    [Serializable]

    public struct OrderTable

    {

        public int order;

        public string window;

    }

}
    }



}