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

client_Hale

2019-01-23 2ef929dbaac6b9b3f0f1a6507f2399d8a3f0884d

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

 Core/GameEngine/Model/Config/WeekPartyConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, January 10, 2019
//    [  Date ]:           Wednesday, January 23, 2019
//--------------------------------------------------------

using UnityEngine;
@@ -16,7 +16,8 @@
        public string Description { get ; private set; } 

        public int jump { get ; private set ; }

        public int order { get ; private set ; }

        public int DailyQusetId { get ; private set ; }
        public int DailyQusetId { get ; private set ; }

        public int SpecialDisplayType { get ; private set ; }

        public override string getKey()
        {
@@ -36,7 +37,9 @@
            

                order=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 

            

                DailyQusetId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
                DailyQusetId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
			
                SpecialDisplayType=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
            }
            catch (Exception ex)
            {

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 59a36668b02da3d4fb47cbc1579228be
timeCreated: 1547105026
timeCreated: 1548209403
licenseType: Free
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/ConfigManager.cs

@@ -228,6 +228,7 @@
        AddAsyncTask<JadeDynastyTowerConfig>();

        AddAsyncTask<JadeDynastyBossConfig>();

        AddAsyncTask<JadeDynastySuitAttrConfig>();

        AddAsyncTask<SkillFrameAnimationConfig>();



        while (!AllCompleted())

        {


 System/JadeDynastySkill/JadeDynastySkillCell.cs

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


namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class JadeDynastySkillCell : CellView

    {

        [SerializeField] Transform m_ContainerSelect;

@@ -24,6 +25,22 @@
            get { return ModelCenter.Instance.GetModel<JadeDynastySkillModel>(); }

        }



        public Transform flyPoint

        {

            get

            {

                return m_SkillIcon.transform;

            }

        }



        public Transform skillLock

        {

            get

            {

                return m_ContainerSkillLock;

            }

        }



        public void Display(int skillId)

        {

            m_ContainerSelect.gameObject.SetActive(skillId == model.selectSkill);


 System/JadeDynastySkill/JadeDynastySkillModel.cs

@@ -6,6 +6,8 @@
using UnityEngine;
namespace Snxxz.UI

{

    [XLua.Hotfix]

    [XLua.LuaCallCSharp]

    public class JadeDynastySkillModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {

        Dictionary<int, List<int>> jadeDynastySkills = new Dictionary<int, List<int>>();

@@ -189,7 +191,8 @@
                    if (serverInited)

                    {

                        if (!NewBieCenter.Instance.inGuiding

                            && !WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())

                            && !WindowCenter.Instance.IsOpen<RealmPropertyUpWin>()

                            && WindowCenter.Instance.IsOpen<JadeDynastySkillWin>())

                        {

                            ActivateShow.JadeDynastySkillUnlock(skillConfig.SkillTypeID);

                        }


 System/JadeDynastySkill/JadeDynastySkillWin.cs

@@ -10,8 +10,9 @@
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {



namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class JadeDynastySkillWin : Window

    {

        [SerializeField] Text m_SkillDescription;

@@ -20,6 +21,8 @@
        [SerializeField] FrameEffect m_SkillFrame;



        [SerializeField] ScrollerController m_ScrollerControl;



        FunctionUnlockFlyObjectTarget flyObjectTarget;



        JadeDynastySkillModel model

        {

@@ -38,11 +41,18 @@


        protected override void OnPreOpen()

        {

            if (flyObjectTarget != null)

            {

                Destroy(flyObjectTarget);

            }



            SetDefaultSelect();

            Display();



            model.selectSkillRefresh += SelectSkillRefresh;

            model.skillRefresh += SkillRefresh;

            ActivateShow.prepareFlySkillEvent += PrepareFlySkillEvent;

            ActivateShow.complelteFlySkillEvent += ComplelteFlySkillEvent;

        }



        protected override void OnAfterOpen()

@@ -53,6 +63,13 @@
        {

            model.selectSkillRefresh -= SelectSkillRefresh;

            model.skillRefresh -= SkillRefresh;

            ActivateShow.prepareFlySkillEvent -= PrepareFlySkillEvent;

            ActivateShow.complelteFlySkillEvent -= ComplelteFlySkillEvent;



            if (flyObjectTarget != null)

            {

                Destroy(flyObjectTarget);

            }

        }



        protected override void OnAfterClose()

@@ -84,7 +101,7 @@
            m_ScrollerControl.Refresh();

            foreach (var skill in model.mySkills)

            {

                m_ScrollerControl.AddCell(ScrollerDataType.Header, skill,OnSelectSkill);

                m_ScrollerControl.AddCell(ScrollerDataType.Header, skill, OnSelectSkill);

            }

            m_ScrollerControl.Restart();



@@ -113,6 +130,39 @@
            }

        }



        private void PrepareFlySkillEvent(ActivateShow.ActivateFunc type, int skillId)

        {

            if (type == ActivateShow.ActivateFunc.JadeDynastySkill)

            {

                var index = model.mySkills.IndexOf(skillId);

                if (index != -1)

                {

                    m_ScrollerControl.JumpIndex(index);

                    var cell = m_ScrollerControl.GetActiveCellView(skillId);

                    if (cell != null)

                    {

                        var skillCell = cell as JadeDynastySkillCell;

                        flyObjectTarget = skillCell.flyPoint.AddMissingComponent<FunctionUnlockFlyObjectTarget>();

                        flyObjectTarget.IdList = new int[] { skillId };

                        flyObjectTarget.Z_UnLockType = FunctionUnlockType.Skill;

                        FunctionUnlockFlyObjectTargetCenter.Register(FunctionUnlockType.Skill, new int[] { skillId }, flyObjectTarget);

                    }

                }

            }

        }



        private void ComplelteFlySkillEvent(ActivateShow.ActivateFunc type)

        {

            if (type == ActivateShow.ActivateFunc.JadeDynastySkill)

            {

                if (flyObjectTarget != null)

                {

                    Destroy(flyObjectTarget);

                }

                m_ScrollerControl.m_Scorller.RefreshActiveCellViews();

            }

        }



        private void SelectSkillRefresh(int skillId)

        {

            DisplaySkillDetail();


 System/OpenServerActivity/OpenServiceAchievementCell.cs

@@ -219,7 +219,7 @@
            int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//已领奖次数

            int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//已完成次数

            var config = Config.Instance.Get<WeekPartyConfig>(ID);

            if (config != null && config.ActionType == 13)

            if (config != null && config.SpecialDisplayType==1)

            {



                if (carryOutNum > 0)


 System/Realm/ActivateShow.cs

@@ -4,6 +4,7 @@
using UnityEngine;
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public static class ActivateShow

    {

        public static ActivateFunc activateType { get; private set; }


 System/Realm/RealmPropertyUpWin.cs

@@ -379,6 +379,7 @@
                    }

                    m_NewGotSkill.DisplayNewGot(ActivateShow.skills[0]);

                    DisplaySkillFrame(ActivateShow.skills[0]);

                    PrepareFly(ActivateShow.skills[0]);

                    break;

                default:

                    {

@@ -479,6 +480,7 @@
                    }

                    break;

                case ActivateShow.ActivateFunc.GodWeaponEffect:

                case ActivateShow.ActivateFunc.JadeDynastySkill:

                    {

                        if (startFly)

                        {