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

client_Hale

2019-01-15 8e89d89c282284629ae4e9a01089deb915ac87c9

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -34,8 +34,7 @@
    public PlayerRankData rank { get { return m_Rank; } }



    StoreModel m_StoreModel;

    StoreModel StoreModel

    {

    StoreModel StoreModel {

        get { return m_StoreModel ?? (m_StoreModel = ModelCenter.Instance.GetModel<StoreModel>()); }

    }



@@ -306,7 +305,17 @@
                }

                break;

            case PlayerDataRefresh.HP:

                baseData.HP = value;

                if (CrossServerUtility.IsCrossServer())

                {

                    if (!isMainServerData)

                    {

                        baseData.HP = value;

                    }

                }

                else

                {

                    baseData.HP = value;

                }

                break;

            case PlayerDataRefresh.MaxMP:

                extersion.MaxMP = (int)value;


 System/GeneralConfig/GeneralDefine.cs

@@ -168,7 +168,6 @@
    public static int fairyLandBuffId { get; private set; }
    public static int achievementEarlierStageLevel { get; private set; }
    public static int DemonJarAutoTime { get; private set; }
    public static List<int> CrossUseItemIds { get; private set; }
    public static Dictionary<int, Dictionary<int, GA_NpcFightSgzcZZ.EquipRandomInfo>> SgzzRobotEquipDict { get; private set; }
    public static Dictionary<int, int> SgzcRealm { get; private set; }

@@ -178,7 +177,6 @@
    {
        try
        {
            CrossUseItemIds = new List<int>(GetIntArray("CrossUseItem"));
            CompareEquipPlaces = GetIntArray("EquipUpType");
            greatMasterStartLV = GetInt("GreatMasterStartLV");
            playerMaxLevel = GetInt("PlayerMaxLV");

 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -975,16 +975,7 @@
                return;

            }



            bool isCrossServer = CrossServerUtility.IsCrossServerBoss();

            bool isCrossUseItem = GeneralDefine.CrossUseItemIds.Contains(itemModel.itemId);

            if(isCrossServer && isCrossUseItem)

            {

                SendCrossServerMakeUseItem(index);

            }

            else

            {

                SendMainServerMakeUseItem(index,useCnt,extra);

            }

            SendMainServerMakeUseItem(index, useCnt, extra);

        }



        public void SendMainServerMakeUseItem(int index,int useCnt,int extra)


 System/Realm/RealmProgressBehaviour.cs

@@ -128,7 +128,8 @@
            m_RealmPoint.text = StringUtility.Contact(UIHelper.AppendStringColor(realmPoint >= config.NeedPoint ? TextColType.Green : TextColType.Red,

                realmPoint.ToString()), "/", config.NeedPoint);



            m_OpenRemind.text = realmPoint < config.NeedPoint ? Language.Get("RealmCollecting", config.NeedPoint - realmPoint) : string.Empty;

            m_OpenRemind.text = realmPoint < config.NeedPoint ?

                UIHelper.ReplaceNewLine(Language.Get("RealmCollecting", config.NeedPoint - realmPoint)) : string.Empty;

            m_OpenRemind.transform.localPosition = m_OpenRemind.transform.localPosition.SetX(m_ContainerPoint.rect.width * (leftRatio + deltaRatio * 0.5f));

        }