Merge remote-tracking branch 'origin/master' into JadeDynastyBoss

client_linchunjie

2019-01-18 c0a3a85d50c594b1aab2e2194d0f8561ddb66d00

Merge remote-tracking branch 'origin/master' into JadeDynastyBoss

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

@@ -36,7 +36,14 @@
                    return;
                }
            }
        }
        }

        if (vNetData.socketType == GameNetSystem.SocketType.CrossSever)

        {

            if (vNetData.RefreshType == (int)PlayerDataRefresh.FightPower)

            {

                return;

            }

        }


        if (vNetData.RefreshType == (int)PlayerDataRefresh.OfficialRank)
        {

 Core/SDK/SDKUtility.cs

@@ -514,6 +514,7 @@
                {

                    onFreePlatformLogoutOk();

                }

                FreePlatformInfo = null;

                break;

            case CodeA2U.FreePlatformLogoutFail:

                if (onFreePlatformLogoutFail != null)

@@ -793,6 +794,10 @@
        m_Json.Clear();

        m_Json["code"] = CodeU2A.FreePlatformLogout;

        SendMessageToSDK(m_Json);

        if (ChannelPlatform == E_ChannelPlatform.Yl)

        {

            FreePlatformLogin();

        }

#endif

    }




 System/JadeDynastyBoss/JadeDynastyBossModel.cs

@@ -13,7 +13,7 @@
        Dictionary<int, List<Item>> dropItemDict = new Dictionary<int, List<Item>>();



        public const int JADEDYNASTY_MAP = 52010;

        public const int FUNCTIONID = 0;

        public const int FUNCTIONID = 163;

        public const int JADEDYNASTY_REDPOINTID = 77003;



        public event Action<int> selectBossRefresh;

@@ -22,7 +22,6 @@
        public int jadeDynastyScore { get; private set; }

        public int challengeLimitCount { get; private set; }

        public int challengeTimes { get; private set; }

        public int assistLimitCount { get; private set; }

        public int assistTimes { get; private set; }



        int m_SelectBossId = 0;

@@ -120,6 +119,11 @@


                jadeDynastyBosses.Sort(SortCompare);

            }



            {

                var config = Config.Instance.Get<FuncConfigConfig>("ZhuXianBossCntCfg");

                challengeLimitCount = int.Parse(config.Numerical2);

            }

        }



        public bool IsJadeDynastyBoss(int bossNpcId)


 System/JadeDynastyBoss/JadeDynastyBossWin.cs

@@ -159,7 +159,7 @@


        public void DisplayAssistTimes()

        {

            m_AssistTimes.text = StringUtility.Contact(model.assistLimitCount - model.assistTimes, "/", model.assistLimitCount);

            m_AssistTimes.text = Language.Get("", model.assistTimes);

        }



        void DisplayDropItems()


 System/OpenServerActivity/OpenServiceAchievementCell.cs

@@ -45,7 +45,7 @@
            {

                RemainingNum = (WeekPartyAction.TotalTimes - rewardNum) / WeekPartyAction.SingleTimes;

            }

            if (WeekPartyAction.TotalTimes  -carryOutNum> 0)

            if (WeekPartyAction.TotalTimes  -carryOutNum> 0 && RemainingNum>0)

            {

                m_TextA.text = Language.Get("OSA_1", RemainingNum);

            }


 Utility/EnumHelper.cs

@@ -1145,6 +1145,7 @@
    DemonJarAuto = 32,

    AssistXianYuanCoinsAdd = 33,//助战仙缘币上限加成

    AssistXianYuanCoinsRatioAdd = 34,//助战仙缘币获得倍率加成（万分比）

    JadeDynastyBoss = 35,

}