Merge branch 'master' into SubWindow

client_Wu Xijin

2019-04-29 33992f224668634bd2df5bd9f181ef0c55c0662d

Merge branch 'master' into SubWindow

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs

@@ -68,6 +68,7 @@
                case E_NpcType.Fight:

                case E_NpcType.FMBoss:

                case E_NpcType.MonsterTime:

                case E_NpcType.PersonalEnemy:



                    if (_npcConfig.Country == 1)

                    {


 System/Alchemy/AlchemyResultWin.cs

@@ -22,6 +22,8 @@
        [SerializeField] Slider m_Slider;

        [SerializeField] ItemBehaviour m_Item;

        [SerializeField] Text m_CloseTip;

        [SerializeField] Image m_FairyStove;

        [SerializeField] Image m_NormalStove;

        [SerializeField] Button m_Close;



        public static Item displayItem;

@@ -85,6 +87,9 @@


        void DisplayStove()

        {

            m_FairyStove.gameObject.SetActive(model.selectAlchemyType == AlchemyType.Fairy);

            m_NormalStove.gameObject.SetActive(model.selectAlchemyType == AlchemyType.Normal);



            m_StoveLevel.text = StringUtility.Contact("Lv.", model.stoveLevel);

            var isMax = !RefineStoveConfig.Has(model.stoveLevel + 1);

            var stoveConfig = RefineStoveConfig.Get(model.stoveLevel);


 System/Equip/EquipFrameWin.cs

@@ -113,6 +113,27 @@
            WindowCenter.Instance.Close<EquipFrameWin>();
        }

        public static int GetRedpointFunction()

        {

            if (ModelCenter.Instance.GetModel<EquipStrengthModel>().redpoint.state == RedPointState.Simple)

            {

                return 0;

            }

            if (ModelCenter.Instance.GetModel<EquipGemModel>().redpoint.state == RedPointState.Simple)

            {

                return 1;

            }

            if (RedpointCenter.Instance.GetRedpointState(910000) == RedPointState.Simple)

            {

                return 2;

            }

            if (RedpointCenter.Instance.GetRedpointState(1720000) == RedPointState.Simple)

            {

                return 3;

            }

            return 0;

        }

    }

}

 System/MainInterfacePanel/LowSettingTip.cs

@@ -143,7 +143,7 @@
        void Strengthen1Button()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<EquipFrameWin>(false, 0);

            WindowCenter.Instance.Open<EquipFrameWin>(false, EquipFrameWin.GetRedpointFunction());

        }



        void OpenEquip()


 Utility/EnumHelper.cs

@@ -121,6 +121,7 @@
    FightAssist = 20,// 助战

    SGZC_FightAssist = 21,// 上古战场助战

    MonsterTime = 22,// 按时间掉血

    PersonalEnemy = 23,// 专属敌人

    OpenWorldMap = 99,// 打开世界地图

}



@@ -568,7 +569,7 @@
    CDBPlayerRefresh_SuperHitRateReduce = 210,//暴击抗性

    CDBPlayerRefresh_LuckyHitReduce = 211,//会心一击伤害固定值减免

    CDBPlayerRefresh_FinalHurtReducePer = 212,//最终伤害百分比减少

    CDBPlayerRefresh_YinjiTime=213,//印记持续时间，单位毫秒

    CDBPlayerRefresh_YinjiTime = 213,//印记持续时间，单位毫秒

    CDBPlayerRefresh_YinjiCount = 214,//印记持续时间，单位毫秒

};