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

client_Hale

2019-06-26 40d050666da8805ad3e52e63bd7a096ae3521905

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

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs

@@ -31,6 +31,7 @@
    public readonly int SuperHitReduceC;

    public readonly int HitC;

    public readonly int MissC;

    public readonly int PetDamPerC;



    public EquipGSParamConfig()

    {

@@ -77,6 +78,8 @@
            int.TryParse(tables[16],out HitC); 



            int.TryParse(tables[17],out MissC); 



            int.TryParse(tables[18],out PetDamPerC); 
        }

        catch (Exception ex)

        {


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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b14139202185e114e8c1b11ee6917430
timeCreated: 1561530128
timeCreated: 1561544279
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs

@@ -40,7 +40,7 @@
        _tagGsProValueDict.Add(PropertyType.ArmorMaxHPPer, gsModel.BaseEquipMaxHPAddPerC);

        _tagGsProValueDict.Add(PropertyType.HeartResis, gsModel.LuckyHitRateReduceC);

        _tagGsProValueDict.Add(PropertyType.CritHurt, gsModel.SuperHitC);



        _tagGsProValueDict.Add(PropertyType.PetAddHurt, gsModel.PetDamPerC);

        return _tagGsProValueDict;

    }

}


 System/DailyQuest/DailyQuestModel.cs

@@ -897,7 +897,7 @@
                        case DailyQuestType.FairyGrabBoss:

                        case DailyQuestType.AllianceBoss:

                        case DailyQuestType.RidingPetActivity:

                            if (dailyQuestState == DailyQuestState.Normal)

                            if (dailyQuestState == DailyQuestState.Normal && !allianceBossModel.isActivityOver)

                            {

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

                            }

@@ -1126,10 +1126,6 @@
                    }

                    break;

                case DailyQuestType.AllianceBoss:

                    if (allianceBossModel.isActivityOver)

                    {

                        return DailyQuestState.Completed;

                    }

                    return DailyQuestState.Normal;

            }




 System/FairyAu/AllianceBossBehaviour.cs

@@ -213,6 +213,12 @@
        {

            error = 0;



            if (PlayerDatas.Instance.baseData.FamilyId == 0)

            {

                error = 6;

                return false;

            }



            var dungeonId = dungeonModel.GetDungeonId(AllianceBossModel.DATAMAPID, index);



            var dungeonConfig = DungeonConfig.Get(dungeonId);

@@ -267,6 +273,9 @@
                case 5:

                    SysNotifyMgr.Instance.ShowTip("Join_Space_Lost");

                    break;

                case 6:

                    SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

                    break;

            }

        }




 System/Role/ReikiRootModel.cs

@@ -101,6 +101,8 @@
        public event Action onReikiRootPointRefresh;

        public event Action<int> onReikiRootPointReset;



        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }



        public override void Init()

        {

            ParseConfig();

@@ -108,6 +110,7 @@
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

        }



        public void OnBeforePlayerDataInitialize()

@@ -131,6 +134,7 @@
            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

            StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;

        }



        void ParseConfig()

@@ -278,6 +282,38 @@
            }

        }



        private void WindowAfterCloseEvent(Window window)

        {

            if (window is TreasureNewGotWin)

            {

                if (treasureModel.newGotTreasureId == treasureAddPoint.treasureId)

                {

                    SnxxzGame.Instance.StartCoroutine(Co_OpenTreasureAddPointRemind());

                }

            }

        }



        IEnumerator Co_OpenTreasureAddPointRemind()

        {

            yield return WaitingForSecondConst.WaitMS500;

            if (!NewBieCenter.Instance.inGuiding)

            {

                var reikiPoint = 0;

                if (PlayerDatas.Instance.baseData.LV >= reikiPointAutoAddLevel)

                {

                    var levels = PlayerDatas.Instance.baseData.LV - reikiPointAutoAddLevel + 1;

                    reikiPoint = levels * treasureAddPoint.point;

                }

                var treasureConfig = TreasureConfig.Get(treasureAddPoint.treasureId);

                ConfirmCancel.ShowRealmPopConfirm(Language.Get("Mail101"),

                    Language.Get("ReikiRootAddPointRemind_1", treasureConfig.Name, reikiPoint),

                    Language.Get("GotoAddPoint"), () =>

                  {

                      WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RolePoint);

                  });

            }

        }



        public int GetReikiRootQuality(int id, int point)

        {

            var config = ReikiRootConfig.Get(id);


 System/Role/TitleModel.cs

@@ -10,14 +10,27 @@
    {

        const string TITLEKEY = "Title";



        public bool reikiPointRemindSymble { get; private set; }



        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }



        public override void Init()

        {

            GlobalTimeEvent.Instance.secondEvent += SecondEvent;

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

        }



        public override void UnInit()

        {

            GlobalTimeEvent.Instance.secondEvent -= SecondEvent;

            StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;

            WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterOpenEvent;

        }



        private void OnStageLoadFinish()

        {

            reikiPointRemindSymble = false;

        }



        public void OnBeforePlayerDataInitialize()

@@ -117,6 +130,11 @@
            if (serverInited)

            {

                SetGet(id, true);



                if (reikiRootModel.titleAddPoint.titleId == id)

                {

                    TryOpenReikiRootPointRemind();

                }

            }

            if (OnRefreshGainTitle != null)

            {

@@ -260,6 +278,39 @@
            UpdateRedpoint();

        }



        private void WindowAfterOpenEvent(Window window)

        {

            if (reikiPointRemindSymble && window is RoleTitle)

            {

                TryOpenReikiRootPointRemind();

            }

        }



        void TryOpenReikiRootPointRemind()

        {

            if (WindowCenter.Instance.IsOpen<RoleTitle>())

            {

                reikiPointRemindSymble = false;

                var reikiPoint = 0;

                if (PlayerDatas.Instance.baseData.LV >= reikiRootModel.reikiPointAutoAddLevel)

                {

                    var level = PlayerDatas.Instance.baseData.LV - reikiRootModel.reikiPointAutoAddLevel + 1;

                    reikiPoint = level * reikiRootModel.titleAddPoint.point;

                }

                var titleConfig = DienstgradConfig.Get(reikiRootModel.titleAddPoint.titleId);

                ConfirmCancel.ShowRealmPopConfirm(Language.Get("Mail101"),

                    Language.Get("ReikiRootAddPointRemind_2", titleConfig.Name, reikiPoint),

                    Language.Get("GotoAddPoint"), () =>

                    {

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RolePoint);

                    });

            }

            else

            {

                reikiPointRemindSymble = true;

            }

        }



        #region 红点

        private Redpoint m_TitleRedpoint=new Redpoint(10101, 1010104);

        public Redpoint titleRedpoint


 System/Skill/TreasureSkillCell.cs

@@ -50,7 +50,7 @@
            if (model.TryGetSkill(skillId, out treasureSkill))

            {

                isSkillUnlock = treasureSkill.level > 0;

                m_SkillLevel.text = StringUtility.Contact("LV.", treasureSkill.level);

                m_SkillLevel.text = string.Empty;// StringUtility.Contact("LV.", treasureSkill.level);

                m_Redpoint.redpointId = treasureSkill.redpoint.id;

            }