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

client_Hale

2019-04-25 f5d59c55ed7cf58fd8ff947c837ee256f6e237d8

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

 Core/GameEngine/Model/Config/TreasureChapterConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Wednesday, April 24, 2019
//    [  Date ]:           Thursday, April 25, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -18,7 +18,8 @@
    public readonly string taskTitle;

    public readonly int chapterIndex;

    public readonly string description;

    public readonly string condition;
    public readonly string condition;

    public readonly string unknown;

    public TreasureChapterConfig()
    {
@@ -40,7 +41,9 @@


            description = tables[4];



            condition = tables[5];
            condition = tables[5];



            unknown = tables[6];
        }
        catch (Exception ex)
        {

 Core/GameEngine/Model/Config/TreasureChapterConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ba38325a271f27842bd40cb84858a5e3
timeCreated: 1556094710
timeCreated: 1556174251
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/MainInterfacePanel/TaskModel.cs

@@ -136,6 +136,9 @@
    public bool TaskOverBool = false;
    private int Times = 0;
    private int NeedWaitTime = 4;

    private float mainTaskAutoWaitTime = 0f;

    PackModel _playerPack;
    PackModel playerPack
    {
@@ -159,6 +162,7 @@
        var Task_Auto = FuncConfigConfig.Get("TaskAuto");
        TaskAutoLv = int.Parse(Task_Auto.Numerical1);
        TaskAutoTime = int.Parse(Task_Auto.Numerical2);
        mainTaskAutoWaitTime = int.Parse(Task_Auto.Numerical3) / 1000f;
        FairyAuTaskCount_Day = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical1.Split('|')[1].Split('_')[1]);
        FairyAuTaskCount_Round = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical2.Split('|')[1].Split('_')[1]);
    }
@@ -1355,6 +1359,11 @@
            yield return WaitingForSecondConst.WaitMS800;//缓冲一秒再进行
        }

        if (MainTaskDic.ContainsKey(_taskID))//主线等待表现

        {

            yield return WaitingForSecondConst.GetWaitForSeconds(mainTaskAutoWaitTime);

        }

        if (GA_Hero.s_MapSwitching)
        {
            yield break;

 System/Treasure/TreasureCollectBriefInfoBehaviour.cs

@@ -15,7 +15,10 @@


    public class TreasureCollectBriefInfoBehaviour : MonoBehaviour

    {

        [SerializeField] Transform m_ContainerDisplay;



        [SerializeField] Transform m_ContainerUnknown;

        [SerializeField] Text m_UnknownDescription;



        [SerializeField] Transform m_ContainerCollect;

        [SerializeField] Image m_Icon;

@@ -66,6 +69,18 @@
            m_Goto.SetListener(OnGoto);

        }



        private void OnEnable()

        {

            m_ContainerDisplay.gameObject.SetActive(false);

            StartCoroutine(Co_Display());

        }



        IEnumerator Co_Display()

        {

            yield return null;

            m_ContainerDisplay.gameObject.SetActive(true);

        }



        private void TreasureStateChangeEvent(int id)

        {

            displayId = GetLatestCollectingTreasure();

@@ -105,6 +120,15 @@
            {

                DisplayTreasureInfo();

                DisplayProgress();

            }

            else

            {

                var id = GetLostTreasure();

                var chapterConfig = TreasureChapterConfig.Get(id);

                if (chapterConfig != null)

                {

                    m_UnknownDescription.text = chapterConfig.unknown;

                }

            }

        }



@@ -179,30 +203,14 @@
                List<int> tasks;

                if (model.TryGetTreasureTasks(id, out tasks))

                {

                    if (latestTask < tasks[0])

                    var lastTask = tasks[tasks.Count - 1];

                    if (latestTask <= lastTask)

                    {

                        return id;

                    }

                }

            }

            return 0;

        }



        bool IsAllCompleted()

        {

            var treasureIds = model.GetTreasureCategory(TreasureCategory.Human);

            foreach (var id in treasureIds)

            {

                Treasure treasure;

                if (model.TryGetTreasure(id, out treasure))

                {

                    if (treasure.state != TreasureState.Collected)

                    {

                        return false;

                    }

                }

            }

            return true;

        }



        private void WindowAfterOpenEvent(Window window)