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

client_Hale

2018-12-12 31498ea5e0605898ac5d577eb3ab311fa90dd39f

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

 System/MainInterfacePanel/PlayerMainDate.cs

@@ -24,6 +24,7 @@
    {

        get { return m_PlayerPackModel ?? (m_PlayerPackModel = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

    }

    DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }

    //用于记录XP技能的信息

    public delegate void OnXpSkill();

    public static event OnXpSkill Event_XpSkill;

@@ -167,7 +168,25 @@
        string WaHuangHighestFloorStr= Config.Instance.Get<FuncConfigConfig>("WaHuangHighestFloor").Numerical1;

        WaHuangHighestFloor = int.Parse(WaHuangHighestFloorStr);

        ruinsTranscriptMapId = int.Parse(Config.Instance.Get<FuncConfigConfig>("SpRewardMapID").Numerical1);//娲皇地图ID

        WHYJPowerDic = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("WHFloorChoose").Numerical1);//娲皇战力



        WHYJPowerDic.Clear();

        for (int i = 0; i < 8; i++)

        {

            DungeonHelpBattleConfig Config = assistModel.GetHelpBattleConfig(51010,i);

            if (Config != null)

            {

                int type = i + 1;

                if (type == 1)

                {

                    WHYJPowerDic.Add(type, 0);

                }

                else

                {

                    WHYJPowerDic.Add(type, Config.RobotFightPower);

                }    
            }

        }

       // WHYJPowerDic = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("WHFloorChoose").Numerical1);//娲皇战力



    }



@@ -402,10 +421,11 @@
        if (WindowCenter.Instance.IsOpen<PowerAddWin>())

        {

            WindowCenter.Instance.CloseImmediately<PowerAddWin>();

            if (prowNum != 0)

            {

                prowNum += power;

            }

           
        }

        if (prowNum != 0)

        {

            prowNum += power;

        }

        WindowCenter.Instance.Open<PowerAddWin>();

    }


 System/Rank/RankHeadCell.cs

@@ -115,16 +115,13 @@
                        realmLv = (int)data.value1;

                        break;

                }

                if (realmLv > 0)

                RealmConfig presentCfg = Config.Instance.Get<RealmConfig>(realmLv);

                if (presentCfg != null)

                {

                    RealmConfig presentCfg = Config.Instance.Get<RealmConfig>(realmLv);

                    if (presentCfg != null)

                    {

                        realmImg.gameObject.SetActive(data.type != (int)PlayerRankData.RankType.Realm);

                        m_CompareImg.gameObject.SetActive(data.type == (int)PlayerRankData.RankType.Realm);

                        realmImg.SetSprite(presentCfg.Img);

                        m_CompareImg.SetSprite(presentCfg.Img);

                    }

                    realmImg.gameObject.SetActive(data.type != (int)PlayerRankData.RankType.Realm);

                    m_CompareImg.gameObject.SetActive(data.type == (int)PlayerRankData.RankType.Realm);

                    realmImg.SetSprite(presentCfg.Img);

                    m_CompareImg.SetSprite(presentCfg.Img);

                }



                bool isSelf = data.ID == PlayerDatas.Instance.PlayerId;


 System/Realm/ActivateShow.cs

@@ -203,7 +203,7 @@
            var dict = _model.GetEffectPropertyUpper(_type, stage);

            fightPower += UIHelper.GetFightPower(dict);

            var requireLevel = _model.GetGodWeaponStageRequireLevel(_type, stage);

            fightPower += _model.TryGetEffectFightPower(_type, requireLevel);

            fightPower += _model.TryGetEffectFightPower(_type, stage);



            titleIconKey = "GodWeaponEffectTitle";




 System/Role/GodWeaponPreviewWin.cs

@@ -100,10 +100,9 @@


        private void DisplayFightPower()

        {

            var requireLevel = model.GetGodWeaponStageRequireLevel(selectGodWeaponType, selectStage);

            var fightPower = 0;

            var dict = model.GetEffectPropertyUpper(selectGodWeaponType, selectStage);

            fightPower += model.TryGetEffectFightPower(selectGodWeaponType, requireLevel);

            fightPower += model.TryGetEffectFightPower(selectGodWeaponType, selectStage);

            if (dict != null)

            {

                fightPower += UIHelper.GetFightPower(dict);


 System/Role/MagicianModel.cs

@@ -714,15 +714,24 @@
            return false;

        }



        public int TryGetEffectFightPower(int type, int level)

        public int TryGetEffectFightPower(int type, int stage)

        {

            if (effectFightPower.ContainsKey(type))

            var previousFightPower = 0;

            if (stage - 1 > 0)

            {

                if (effectFightPower[type].ContainsKey(level))

                var previousLevel = GetGodWeaponStageRequireLevel(type, stage - 1);

                if (effectFightPower.ContainsKey(type)

                    && effectFightPower[type].ContainsKey(previousLevel))

                {

                    return effectFightPower[type][level];

                    previousFightPower = effectFightPower[type][previousLevel];

                }

            }

            var level = GetGodWeaponStageRequireLevel(type, stage);

            if (effectFightPower.ContainsKey(type)

                && effectFightPower[type].ContainsKey(level))

            {

                return effectFightPower[type][level] - previousFightPower;

            }

            return 0;

        }