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

client_Wu Xijin

2019-05-17 ec198ef91d746053ff40698f72b0ab7599c7a6bb

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

 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs

@@ -20,9 +20,9 @@
    public readonly string items;

    public readonly string sideTasks;

    public readonly string reikiRoot;

    public readonly int[] succGuide;

    public readonly int succGuide;

    public readonly int jump;

    public readonly int[] failFuncs;

    public readonly string failFuncs;

    public readonly string[] remind;

    public TaskFeedbackConfig()
@@ -49,21 +49,11 @@


            reikiRoot = tables[6];



            string[] succGuideStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            succGuide = new int[succGuideStringArray.Length];
            for (int i=0;i<succGuideStringArray.Length;i++)
            {
                 int.TryParse(succGuideStringArray[i],out succGuide[i]);
            }

            int.TryParse(tables[7],out succGuide); 


            int.TryParse(tables[8],out jump); 



            string[] failFuncsStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            failFuncs = new int[failFuncsStringArray.Length];
            for (int i=0;i<failFuncsStringArray.Length;i++)
            {
                 int.TryParse(failFuncsStringArray[i],out failFuncs[i]);
            }

            failFuncs = tables[9];



            remind = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
        }

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1558059182
timeCreated: 1558075313
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Alchemy/AlchemyModel.cs

@@ -432,7 +432,7 @@


        public void ReceivePackage(HA3BF_tagMCPlayerStoveMsg package)

        {

            var seconds = 0;

            var seconds = 0f;



            for (int i = 0; i < package.StoveCnt; i++)

            {

@@ -443,10 +443,10 @@
                {

                    var config = AlchemyConfig.Get((int)data.AlchemyID);

                    var time = TimeUtility.GetTime(data.StartTime);

                    var _seconds = (int)(TimeUtility.ServerNow - time).TotalSeconds;

                    var _seconds = (TimeUtility.ServerNow - time).TotalSeconds;

                    if (_seconds < config.NeedTime && config.NeedTime - _seconds > seconds)

                    {

                        seconds = config.NeedTime - _seconds;

                        seconds = config.NeedTime - (float)_seconds + 0.3f;

                    }

                }

            }


 System/BossShow/ShowActor.cs

@@ -162,6 +162,7 @@
                        _animNodde.Play(GAStaticDefine.State_IdleHash);

                    }

                }

                LayerUtility.SetLayer(sfxController.gameObject, LayerUtility.BossShow, true);

            }

        }

        RequestCircleShadow();


 System/HazyRegion/ClientHazyGrassStage.cs

@@ -5,8 +5,7 @@
using UnityEngine;

public class ClientHazyGrassStage : DungeonStage

{

    static readonly Vector3 PlayerBornPosition1 = new Vector3(17.25f, 5.12f, 3.70f);

    static readonly Vector3 PlayerBornPosition2 = new Vector3(17.25f, 5.12f, 3.70f);

    static readonly Vector3 PlayerBornPosition1 = new Vector3(19.401f, 4.985f, 5.494f);



    static List<HazyMapNpcScriptableObject.NpcInfo> s_NpcInfos = new List<HazyMapNpcScriptableObject.NpcInfo>();

    static Dictionary<Vector3, GA_NpcClientCollect> s_CollectNpcs = new Dictionary<Vector3, GA_NpcClientCollect>();

@@ -155,14 +154,8 @@
    void InitialPlayer()

    {

        var hero = PlayerDatas.Instance.hero;

        if (incidentType == HazyRegionIncidentType.ReikiGrass)

        {

            hero.Pos = PlayerBornPosition1;

        }

        else if (incidentType == HazyRegionIncidentType.FairyGrass)

        {

            hero.Pos = PlayerBornPosition2;

        }

        hero.Pos = PlayerBornPosition1;

        hero.Rotation = Quaternion.Euler(0, -9.537001f, 0);

        CameraController.Instance.Apply();

    }




 System/MainInterfacePanel/TaskFeedbackModel.cs

@@ -100,6 +100,20 @@
                        break;

                }



                if (string.IsNullOrEmpty(config.failFuncs))

                {

                    var funcArray = LitJson.JsonMapper.ToObject<int[][]>(config.failFuncs);

                    if (funcArray != null)

                    {

                        List<int[]> failFuncs = new List<int[]>(funcArray.Length);

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

                        {

                            failFuncs.Add(funcArray[i]);

                        }

                        feedback.failFuns = failFuncs;

                    }

                }



                m_TaskFeedbacks.Add(config.taskId, feedback);

            }

        }

@@ -133,8 +147,7 @@
                            int condition = 0;

                            if (IsSatisfyCondition(feedback, out condition))

                            {

                                var guide = config.succGuide != null

                                    && config.succGuide.Length > 0 ? config.succGuide[0] : 0;

                                var guide = config.succGuide;

                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))

                                {

                                    ExecuteGuide(guide);

@@ -154,10 +167,11 @@
                                    var index = Mathf.Min(condition, config.remind.Length - 1);

                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);

                                }

                                if (config.failFuncs != null && config.failFuncs.Length > 0)

                                if (feedback.failFuns != null)

                                {

                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);

                                    taskFeedbackFuncs.Clear();

                                    taskFeedbackFuncs.AddRange(config.failFuncs);

                                    taskFeedbackFuncs.AddRange(feedback.failFuns[index]);

                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                }

                            }

@@ -168,8 +182,7 @@
                            int condition = 0;

                            if (IsSatisfyCondition(feedback, out condition))

                            {

                                var guide = config.succGuide != null

                                    && config.succGuide.Length > 0 ? config.succGuide[0] : 0;

                                var guide = config.succGuide;

                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))

                                {

                                    ExecuteGuide(guide);

@@ -190,10 +203,11 @@
                                    var index = Mathf.Min(taskIndex, config.remind.Length - 1);

                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);

                                }

                                if (config.failFuncs != null && config.failFuncs.Length > 0)

                                if (feedback.failFuns != null)

                                {

                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);

                                    taskFeedbackFuncs.Clear();

                                    taskFeedbackFuncs.AddRange(config.failFuncs);

                                    taskFeedbackFuncs.AddRange(feedback.failFuns[index]);

                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                }

                            }

@@ -204,8 +218,7 @@
                            int condition = 0;

                            if (IsSatisfyCondition(feedback, out condition))

                            {

                                var guide = config.succGuide != null

                                    && config.succGuide.Length > 0 ? config.succGuide[0] : 0;

                                var guide = config.succGuide;

                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))

                                {

                                    ExecuteGuide(guide);

@@ -226,10 +239,11 @@
                                    var index = Mathf.Min(taskIndex, config.remind.Length - 1);

                                    SysNotifyMgr.Instance.ShowTip(config.remind[index]);

                                }

                                if (config.failFuncs != null && config.failFuncs.Length > 0)

                                if (feedback.failFuns != null)

                                {

                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);

                                    taskFeedbackFuncs.Clear();

                                    taskFeedbackFuncs.AddRange(config.failFuncs);

                                    taskFeedbackFuncs.AddRange(feedback.failFuns[index]);

                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                }

                            }

@@ -360,6 +374,7 @@
        public int[] equipCondition;

        public List<Item> items;

        public Dictionary<int, List<int[]>> reikiRoots;

        public List<int[]> failFuns;



        public int IndexOfSideTasks(int taskId)

        {