少年修仙传客户端代码仓库
client_Hale
2019-01-16 bdd7150dd021c84935c7be3c5d0be84384e37a95
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
28 ■■■■ 已修改文件
System/CrossServerBoss/CrossServerBossModel.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/InGamePushContainer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityNotifyWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/HUD/HeadUpName.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/EnumHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerBoss/CrossServerBossModel.cs
@@ -426,16 +426,16 @@
        public void UpdateRedpoint()
        {
            if (!FuncOpen.Instance.IsFuncOpen(162))
            {
                redpoint.count = 0;
            }
            else
            if (FuncOpen.Instance.IsFuncOpen(162) && TimeUtility.OpenDay >= GeneralDefine.crossServerOneVsOneOpenDay)
            {
                var wearyValueLimit = GeneralDefine.bossWearyValues[2];
                var count = (wearyValueLimit - wearyValue) + (GeneralDefine.dogzBoxLimit - bigBoxCollectCount);
                redpoint.count = count;
            }
            else
            {
                redpoint.count = 0;
            }
            redpoint.state = redpoint.count > 0 ? RedPointState.Quantity : RedPointState.None;
            CrossServerUtility.UpdateCrossServerRedpoint();
System/Dungeon/DungeonModel.cs
@@ -1010,7 +1010,7 @@
                                && dungeonResult.leaderID == PlayerDatas.Instance.baseData.PlayerID)
                            {
                                RealmBossShow.Instance.Open(realmModel.cacheRealmLv);
                                ModelCenter.Instance.GetModel<ChatCenter>().CheckSendRealmThanks();
                                //ModelCenter.Instance.GetModel<ChatCenter>().CheckSendRealmThanks();
                            }
                            else
                            {
System/MainInterfacePanel/InGamePushContainer.cs
@@ -34,6 +34,8 @@
        ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }
        DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
        DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
        CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
        FBHelpPointExchageModel exchageModel { get { return ModelCenter.Instance.GetModel<FBHelpPointExchageModel>(); } }
@@ -51,6 +53,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
        public void Init()
        {
            CheckBetterEquip();
@@ -275,6 +278,10 @@
                        killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];
                        show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
                        break;
                    case FindPreciousType.CrossServerBoss:
                        killable = crossServerBossModel.wearyValue < GeneralDefine.bossWearyValues[2];
                        show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
                        break;
                }
                if (!killable)
System/OpenServerActivity/OpenServerActivityNotifyWin.cs
@@ -41,6 +41,12 @@
        private void CheckFlashRushToBuy()
        {
            if(CrossServerUtility.IsCrossServerOneVsOne())
            {
                flashRushToBuyNotify.gameObject.SetActive(false);
                return;
            }
            OperationFlashRushToBuy.FlashSaleShop saleShop = null;
            if(activityNotifyModel.flashSaleShops.Count > 0)
            {
UI/HUD/HeadUpName.cs
@@ -93,7 +93,7 @@
        {
            if (m_Realm)
            {
                if (_realm > 0)
                if (_realm > 0 && Config.Instance.ContainKey<RealmConfig>(_realm))
                {
                    m_Realm.gameObject.SetActive(true);
                    m_PlayerName.alignment = TextAnchor.MiddleLeft;
Utility/EnumHelper.cs
@@ -902,6 +902,7 @@
    Dogz = 138, //神兽
    AddPoint = 145,//加点
    CrossServer = 157, //跨服天梯赛
    CrossServerBoss=162,
}
//属性类型
public enum AttrEnum