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

client_Hale

2019-03-11 6a076b14aa0debe8aa5bdc01b9b8747b15c13286

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

 Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs

@@ -120,28 +120,6 @@
        High = 2,

    }

    #endregion



    #region 采集

    public float CollectTime { get; private set; }

    public static event Action<H0812_tagBeginPrepare> OnPlayerCollect;

    public static event Action<int, byte> OnPlayerCollectEnd;

    public void OnRefreshData(H0812_tagBeginPrepare vNetData)

    {

        CollectTime = vNetData.MaxTime;

        if (OnPlayerCollect != null)

            OnPlayerCollect(vNetData);

        if (vNetData.PlayerID == PlayerDatas.Instance.baseData.PlayerID)

        {

            WindowCenter.Instance.Open<RealmCollectWin>();

        }

    }



    public void OnRefreshData(H0813_tagPrepareEnd vNetData)

    {

        if (OnPlayerCollectEnd != null)

            OnPlayerCollectEnd((int)vNetData.PlayerID, vNetData.Type);

    }

    #endregion

}



public class RealmHoldData


 Core/GameEngine/Model/Player/Realm/RealmModel.cs

@@ -170,39 +170,6 @@
        {

        }



        #region 玩家是否在打坐状态

        public bool IsInJumpToDaZuo = false;

        public Dictionary<uint, byte> playerSitDic = new Dictionary<uint, byte>();

        public void OnRefreshData(H0411_tagPlayerSit vNetData)

        {

            if (playerSitDic.ContainsKey(vNetData.PlayerID))

            {

                playerSitDic[vNetData.PlayerID] = vNetData.Type;

            }

            else

            {

                playerSitDic.Add(vNetData.PlayerID, vNetData.Type);

            }

            GActorPlayerBase player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;

            if (player != null)

            {

                if (vNetData.Type == 0)

                {

                    GA_Player _otherPlayer = player as GA_Player;

                    if (_otherPlayer != null)

                    {

                        _otherPlayer.StopMoveToPosition();

                    }

                    player.Dazuo();

                }

                else if (vNetData.Type == 1)

                {

                    player.IdleImmediate();

                }

            }

        }

        #endregion



        #region 配置

        public const int REALM_DUNGEON_ID = 31110;

        public int realmHoleLimit { get; private set; }


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

@@ -8,15 +8,6 @@


public class DTC0411_tagPlayerSit : DtcBasic

{

    RealmModel m_RealmModel;

    RealmModel realmModel

    {

        get

        {

            return m_RealmModel ?? (m_RealmModel = ModelCenter.Instance.GetModel<RealmModel>());

        }

    }



    FairyFeastModel fairyFeastModel

    {

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

@@ -30,7 +21,7 @@


        if (vNetData != null)

        {

            realmModel.OnRefreshData(vNetData);

            PlayerSitHandler.Instance.ReceivePackage(vNetData);

            fairyFeastModel.UpdateTransmitState(vNetData);

        }

    }


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

@@ -43,8 +43,8 @@


        if (vNetData.Reason == 0)

        {

            if (!model.playerSitDic.ContainsKey(vNetData.ObjID)

              || model.playerSitDic[vNetData.ObjID] == 1)

            if (!PlayerSitHandler.Instance.playerSitDict.ContainsKey(vNetData.ObjID)

              || PlayerSitHandler.Instance.playerSitDict[vNetData.ObjID] == 1)

            {

                _actor.IdleImmediate();

                _actor.StopPathFind();


 Fight/PrepareHandler.cs

@@ -85,7 +85,17 @@
                break;
            case E_PrepareType.pstCollecting:

                PlayerDatas.Instance.realm.OnRefreshData(H0812);
                if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)

                {

                    NormalCollectWin.s_CollectInfo = new ClientH0812()

                    {

                        PlayerID = PlayerDatas.Instance.PlayerId,

                        PrepareState = (byte)E_PrepareType.pstMissionCollecting,

                        MaxTime = H0812.MaxTime,

                        PrepareID = (int)H0812.PrepareID,

                    };

                    WindowCenter.Instance.Open<NormalCollectWin>();

                }

                _player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
                if (_player != null)
@@ -108,7 +118,17 @@
                break;
            case E_PrepareType.pstMissionCollecting:

                PlayerDatas.Instance.realm.OnRefreshData(H0812);
                if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)

                {

                    NormalCollectWin.s_CollectInfo = new ClientH0812()

                    {

                        PlayerID = PlayerDatas.Instance.PlayerId,

                        PrepareState = (byte)E_PrepareType.pstMissionCollecting,

                        MaxTime = H0812.MaxTime,

                        PrepareID = (int)H0812.PrepareID,

                    };

                    WindowCenter.Instance.Open<NormalCollectWin>();

                }

                _player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
                if (_player != null)
@@ -135,6 +155,7 @@
    }

    public UnityEngine.Events.UnityAction OnPrepareEndSuccess;
    public UnityEngine.Events.UnityAction<int, int> OnPrepareEnd;

    public void ServerPrepareEnd(H0813_tagPrepareEnd h0813)
    {
@@ -147,7 +168,11 @@
        }

        WindowCenter.Instance.Close<PrepareWin>();
        PlayerDatas.Instance.realm.OnRefreshData(h0813);

        if (h0813.PlayerID == PlayerDatas.Instance.baseData.PlayerID)

        {

            WindowCenter.Instance.Close<NormalCollectWin>();

        }

        GActorPlayerBase _player = null;

@@ -240,6 +265,10 @@
            //Debug.LogFormat("收到进度条结束异常情况: {0}", (E_PrepareType)h0813.Type);
        }

        if (OnPrepareEnd != null)

        {

            OnPrepareEnd((int)h0813.PlayerID, h0813.Type);

        }

        H0812 = null;
    }

 Lua/Gen/SnxxzUIRealmModelWrap.cs

@@ -26,7 +26,6 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnRefreshData", _m_OnRefreshData);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRealmHelperAttr", _m_GetRealmHelperAttr);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsBigRealm", _m_IsBigRealm);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetRealmStage", _m_TryGetRealmStage);
@@ -48,8 +47,6 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmSuppressHurt", _g_get_realmSuppressHurt);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsRealmHighest", _g_get_IsRealmHighest);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsDungeonState", _g_get_IsDungeonState);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsInJumpToDaZuo", _g_get_IsInJumpToDaZuo);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "playerSitDic", _g_get_playerSitDic);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmRedpoint", _g_get_realmRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "openedRealmUpWin", _g_get_openedRealmUpWin);
            
@@ -57,8 +54,6 @@
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "openByDungeonStep", _s_set_openByDungeonStep);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "leaderId", _s_set_leaderId);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "realmDungeonState", _s_set_realmDungeonState);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "IsInJumpToDaZuo", _s_set_IsInJumpToDaZuo);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "playerSitDic", _s_set_playerSitDic);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "realmRedpoint", _s_set_realmRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "openedRealmUpWin", _s_set_openedRealmUpWin);
            
@@ -176,34 +171,6 @@
                {
                    
                    gen_to_be_invoked.UnInit(  );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnRefreshData(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    H0411_tagPlayerSit _vNetData = (H0411_tagPlayerSit)translator.GetObject(L, 2, typeof(H0411_tagPlayerSit));
                    
                    gen_to_be_invoked.OnRefreshData( _vNetData );
                    
                    
                    
@@ -576,34 +543,6 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_IsInJumpToDaZuo(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsInJumpToDaZuo);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_playerSitDic(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.playerSitDic);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_realmRedpoint(RealStatePtr L)
        {
            try {
@@ -686,36 +625,6 @@
            
                Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.realmDungeonState = LuaAPI.lua_toboolean(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_IsInJumpToDaZuo(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.IsInJumpToDaZuo = LuaAPI.lua_toboolean(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_playerSitDic(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.playerSitDic = (System.Collections.Generic.Dictionary<uint, byte>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<uint, byte>));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);

 System/Activity/ActivityNotifyBehaviour.cs

@@ -149,6 +149,16 @@
                    case DailyQuestType.CrossServerPk:

                        WindowCenter.Instance.Open<CrossServerWin>();

                        break;

                    case DailyQuestType.AllianceBoss1:

                        dungeonModel.currentDungeon = new Dungeon(AllianceBossModel.DATAMAPID, 0);

                        AllianceBossEntranceWin.dailyQuestId = (int)DailyQuestType.AllianceBoss1;

                        WindowCenter.Instance.Open<AllianceBossEntranceWin>();

                        break;

                    case DailyQuestType.AllianceBoss2:

                        dungeonModel.currentDungeon = new Dungeon(AllianceBossModel.DATAMAPID, 1);

                        AllianceBossEntranceWin.dailyQuestId = (int)DailyQuestType.AllianceBoss2;

                        WindowCenter.Instance.Open<AllianceBossEntranceWin>();

                        break;

                }

            }

            else


 System/Auction/FamilyAuctioncell.cs

@@ -110,8 +110,8 @@
            }

            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？";

                int jade = (int)PlayerDatas.Instance.baseData.diamond;               
                string str = Language.Get("PMH_02", auctionItem.BuyoutPrice);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

@@ -131,7 +131,7 @@
            m_BiddingButton.SetListener(() => //竞价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = "是否花费" + needJade + "参与竞价？";

                string str = Language.Get("PMH_01", needJade);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

@@ -167,8 +167,8 @@
                        m_BiddingButton.interactable = false;

                        m_BiddingImage.gray = true;

                    }

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

                    m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始";

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;                  
                    m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));

                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

@@ -183,7 +183,7 @@
                        m_BiddingImage.gray = false;

                    }

                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

            }

        }

 System/Auction/FullServiceAuctioncell.cs

@@ -129,7 +129,7 @@
            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？";

                string str = Language.Get("PMH_02", auctionItem.BuyoutPrice);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

@@ -150,7 +150,7 @@
            m_BiddingButton.SetListener(() => //竞价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = "是否花费" + needJade + "参与竞价？";

                string str = Language.Get("PMH_01", needJade);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

@@ -166,118 +166,7 @@
                });

            });

        }

        //public override void Refresh(CellView cell)

        //{

        //    m_NeedImage.SetActive(false);

        //    m_ParticipateImage.SetActive(false);

        //    m_BiddingTextObj.SetActive(false);

        //    m_HighestPriceImage.SetActive(false);

        //    m_EquipmentScoreObj.SetActive(false);

        //    var index = cell.index;

        //    if (index >= model.FullServiceAuctionList.Count)

        //    {

        //        DebugEx.LogError("超出数据存储范围");

        //        return;

        //    }



        //    var fullServiceAuction = model.FullServiceAuctionList[index];

        //    if (index == 1)

        //    {

        //        var sendNumber = AuctionInquiry.Instance.GetSendNumber();

        //        if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool)

        //        {

        //            AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 2);

        //            auctionHelpModel.Wait = false;

        //        }

        //    } else if (index== model.FullServiceAuctionList.Count-2)

        //    {

        //        var sendNumber = AuctionInquiry.Instance.GetSendNumber();

        //        if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool)

        //        {

        //            AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 1);

        //            auctionHelpModel.Wait = false;

        //        }

        //    }

        //    FullServiceAuction = fullServiceAuction;

        //    var playerId = PlayerDatas.Instance.baseData.PlayerID;

        //    var auctionItem = AuctionItemConfig.Get(fullServiceAuction.ItemID);          
        //    var itemConfig = ItemConfig.Get(fullServiceAuction.ItemID);

        //    if (itemConfig == null)

        //    {

        //        DebugEx.LogError("物品表没有找到该物品，物品ID为" + fullServiceAuction.ItemID);

        //        return;

        //    }

        //    if (auctionItem == null)

        //    {

        //        DebugEx.LogError("拍卖物品表没有找到该物品，物品ID为"+ fullServiceAuction.ItemID);

        //        return;

        //    }

        //    AuctionItem = auctionItem;

        //    if (model.BiddingItemInfoDic.ContainsKey(fullServiceAuction.ItemGUID))//参与了竞价的物品

        //    {

        //        var biddingItemInfo = model.BiddingItemInfoDic[fullServiceAuction.ItemGUID];

        //        m_ParticipateImage.SetActive(true);

        //        if (biddingItemInfo.BidderID == playerId)//判断是否最高竞价

        //        {

        //            m_HighestPriceImage.SetActive(true);

        //        }

        //        else

        //        {

        //            m_BiddingTextObj.SetActive(true);

        //        }

        //    }

        //    ItemCellModel cellModel = new ItemCellModel(fullServiceAuction.ItemID, true, 
        //        (ulong)fullServiceAuction.ItemCount, itemConfig.BindType);

        //    m_ItemCell.Init(cellModel);

        //    m_ItemName.text = itemConfig.ItemName;

        //    if (itemConfig.EquipPlace != 0)

        //    {

        //        m_EquipmentScoreObj.SetActive(true);

        //       // m_Score.text

        //    }

        //    int needJade = 0;

        //    if (fullServiceAuction.BidderPrice == 0)

        //    {

        //        needJade = auctionItem.BasePrice;

        //    }

        //    else

        //    {

        //        needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd;

        //    }

        //    m_JadeNumber.text = needJade.ToString();

        //    m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString();

        //    m_PriceButton.SetListener(()=> //一口价

        //    {

        //        int jade = (int)PlayerDatas.Instance.baseData.diamond;

        //        string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？";

        //        ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

        //            if (jade >= auctionItem.BuyoutPrice)

        //            {

        //                AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, auctionItem.BuyoutPrice);

        //            }

        //            else

        //            {

        //                WindowCenter.Instance.Open<RechargeTipWin>();

        //            }

        //        });

        //    });

        //    m_JadeNumber2.text = needJade.ToString();

        //    m_BiddingButton.SetListener(()=> //竞价

        //    {

        //        int jade = (int)PlayerDatas.Instance.baseData.diamond;

        //        string str = "是否花费" + needJade + "参与竞价？";

        //        ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

        //            if (jade >= needJade)

        //            {

        //                AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, needJade);

        //            }

        //            else

        //            {

        //                WindowCenter.Instance.Open<RechargeTipWin>();

        //            }

        //        });

        //    });

        //}

        private void LateUpdate()

        {

            if (AuctionItem != null && FullServiceAuction != null)

@@ -298,7 +187,7 @@
                        m_BiddingImage.gray = true;

                    }

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

                    m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始";

                    m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));

                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

@@ -313,7 +202,7 @@
                        m_BiddingImage.gray = false;

                    }

                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

            }

        }


 System/Auction/MyAuctionCell.cs

@@ -68,11 +68,19 @@
            m_Income.text = 0.ToString();

            if (myAuction.BidderPrice == 0)

            {

                m_BiddingText.text = "暂无出价";

                m_BiddingText.text = Language.Get("PMH_05");

            }

            else

            {

                m_BiddingText.text = "竞价中...";

               
                if (myAuction.AuctionType == 0)//是否仙盟拍品流拍至全服拍品

                {

                    m_BiddingText.text = Language.Get("PMH_07");

                }

                else

                {

                    m_BiddingText.text = Language.Get("PMH_06");

                }

                if (type == 0)

                {

                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

@@ -126,13 +134,13 @@
                int minute = (int)timeSpan.TotalMinutes;

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

                    m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始";

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;                    
                    m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));

                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

            }

        }

 System/Auction/MyFocusCell.cs

@@ -119,8 +119,8 @@
            m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString();

            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？";

                int jade = (int)PlayerDatas.Instance.baseData.diamond;               
                string str = Language.Get("PMH_02", auctionItem.BuyoutPrice);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

@@ -138,8 +138,8 @@
            m_JadeNumber2.text = (needJade).ToString();

            m_BiddingButton.SetListener(() => //竞价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = "是否花费" + needJade + "参与竞价？";

                int jade = (int)PlayerDatas.Instance.baseData.diamond;              
                string str = Language.Get("PMH_01", needJade);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

@@ -175,8 +175,8 @@
                        m_BiddingButton.interactable = false;

                        m_BiddingImage.gray = true;

                    }

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

                    m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始";

                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;                  
                    m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));

                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

@@ -191,7 +191,7 @@
                        m_BiddingImage.gray = false;

                    }

                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

            }

        }

 System/Auction/TransactionRecordWin.cs

@@ -115,9 +115,58 @@
            Text transactionStatusText = cell.transform.Find("TransactionStatusText").GetComponent<Text>();

            Text timeText = cell.transform.Find("TimeText").GetComponent<Text>();

            ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1, itemConfig.BindType);



            GameObject SuccessfulBiddingObj = cell.transform.Find("SuccessfulBiddingObj").gameObject;//竞拍成功(竞拍成功)

            Text SuccessfulBiddingText= cell.transform.Find("SuccessfulBiddingObj/SuccessfulBiddingText").GetComponent<Text>();

            Text JadeMoney= cell.transform.Find("SuccessfulBiddingObj/JadeMoney").GetComponent<Text>();



            GameObject AuctionFailedObj = cell.transform.Find("AuctionFailedObj").gameObject;//竞拍失败

            Text JadeMoney_1 = cell.transform.Find("AuctionFailedObj/JadeMoney").GetComponent<Text>();

            switch (auctionRecord.RecordResult)

            {

                case 0://流拍

                    transactionStatusText.gameObject.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    AuctionFailedObj.SetActive(false);

                    if (AuctionType == 0)

                    {

                        transactionStatusText.text = Language.Get("PMH_11");

                    }

                    else if (AuctionType==1)

                    {

                        transactionStatusText.text = Language.Get("PMH_12");

                    }

                    break;

                case 1://拍卖成交（竞拍成功）

                    SuccessfulBiddingObj.SetActive(true);

                    transactionStatusText.gameObject.SetActive(false);

                    AuctionFailedObj.SetActive(false);

                    SuccessfulBiddingText.text = Language.Get("PMH_13");

                    JadeMoney.text = auctionRecord.BidderPrice.ToString();

                    break;

                case 2://回收

                    transactionStatusText.gameObject.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    AuctionFailedObj.SetActive(false);

                    transactionStatusText.text = Language.Get("PMH_14");

                    break;

                case 3://竞价成功

                    SuccessfulBiddingObj.SetActive(true);

                    transactionStatusText.gameObject.SetActive(false);

                    AuctionFailedObj.SetActive(false);

                    SuccessfulBiddingText.text = Language.Get("PMH_15", auctionRecord.BidderName);

                    JadeMoney.text = auctionRecord.BidderPrice.ToString();

                    break;

                case 4://竞价失败

                    AuctionFailedObj.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    transactionStatusText.gameObject.SetActive(false);

                    JadeMoney_1.text= auctionRecord.BidderPrice.ToString();

                    break;

            }



            itemCell.Init(cellModel);

            textName.text = itemConfig.ItemName;

            transactionStatusText.text = GetRecordResultName(auctionRecord.RecordResult);

            timeText.text = auctionRecord.TimeStr;

        }



@@ -156,39 +205,14 @@
            switch (index)

            {

                case 0:

                    str = "我的拍品";

                    str = Language.Get("PMH_08");

                    break;

                case 1:

                    str = "仙盟拍品";

                    str = Language.Get("PMH_09");

                    break;

                case 2:

                    str = "我的竞拍";

                    str = Language.Get("PMH_10");

                    break;

            }

            return str;

        }

        private string GetRecordResultName(int index)

        {

            string str = string.Empty;

            switch (index)

            {

                case 0:

                    str = "流拍";

                    break;

                case 1:

                    str = "拍卖成交";

                    break;

                case 2:

                    str = "回收";

                    break;

                case 3:

                    str = "竞价成功";

                    break;

                case 4:

                    str = "竞价失败";

                    break;



            }

            return str;

        }

 System/Chat/ChatCenter.cs

@@ -25,8 +25,7 @@
            VoiceHttpRequest.Instance.samplesDecodecComplete += SamplesDecodecComplete;

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            PlayerRealmData.OnPlayerCollectEnd += OnPlayerCollectEnd;

            //SnxxzGame.Instance.AddApplicationOutAction(OnApplicationQuit);

            PrepareHandler.Instance.OnPrepareEnd += OnPrepareEnd;



            var time = bandTime;

            banTimeArray[0] = time.Year;

@@ -784,7 +783,7 @@


        #region 仙盟宴会采集完后打开聊天界面

        bool openChatAfterCollect = false;

        private void OnPlayerCollectEnd(int playerId, byte type)

        private void OnPrepareEnd(int playerId, int type)

        {

            if (playerId == PlayerDatas.Instance.baseData.PlayerID

                && type == 0 && PlayerDatas.Instance.baseData.MapID == 31230)


 System/FairyAu/AllianceBossEntranceWin.cs

@@ -21,6 +21,7 @@
        [SerializeField] Text m_Description;

        [SerializeField] ItemBehaviour[] m_Items;

        [SerializeField] Button m_Goto;

        [SerializeField] Button m_Close;



        AllianceBossModel allianceBossModel { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } }

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

@@ -35,6 +36,7 @@
        protected override void AddListeners()

        {

            m_Goto.AddListener(GotoAllianceBoss);

            m_Close.AddListener(CloseClick);

        }



        protected override void OnPreOpen()


 System/FriendSystem/MailAllModel.cs

@@ -392,6 +392,12 @@
                        }



                        string[] mailCont = _mailModel.Content.Split(new string[] { "{0}" }, StringSplitOptions.None);



                        if (mailCont != null && mailCont.Length > 0 && _mailParalist.Count != mailCont.Length)

                        {

                            DebugEx.Log("参数数量不一致" + info.Text);

                        }



                        for (int i = 0; i < mailCont.Length; i++)

                        {

                            if (i < mailCont.Length - 1)


 System/GatheringSoul/GatherSoulBuildBehaviour.cs

@@ -39,7 +39,7 @@
        {

            get

            {

                return WindowCenter.Instance.IsOpen<RealmCollectWin>();

                return WindowCenter.Instance.IsOpen<NormalCollectWin>();

            }

        }




 System/Message/HrefAnalysis.cs

@@ -247,6 +247,12 @@
                        presentHrefInfo.Add(split_value, array[1]);

                    }

                    break;

                case "auctionbidding":

                    {

                        presentHrefInfo.mEvents.Add(RichTextEventEnum.AuctionBidding);

                        presentHrefInfo.Add(split_value, array[1]);

                    }

                    break;

                default:

                    {

                        presentHrefInfo.Add(split_value, array[1]);


 System/Message/RichEvent.cs

@@ -23,4 +23,5 @@
    GetWay,//获取途径

    JOINTEAM,//加入队伍

    AncientRobotName,//上古战场随机名字

    AuctionBidding,//集市竞价

}


 System/Message/RichNormalEvent.cs

@@ -16,6 +16,7 @@
        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.GetWay, this);

        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.JOINTEAM, this);

        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.AncientRobotName, this);

        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.AuctionBidding, this);

    }



    public override bool Execute(RichTextEventEnum type, RichTextMgr.HrefInfo href)

@@ -107,6 +108,15 @@
                    }

                }

                break;

            case RichTextEventEnum.AuctionBidding:

                {

                    if (href.mSplits.ContainsKey("auctionbidding"))

                    {

                        var guid = href.mSplits["auctionbidding"];

                        //--竞价

                    }

                }

                break;

        }

        return false;

    }


 System/Realm/NormalCollectWin.cs

New file
@@ -0,0 +1,98 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Saturday, October 14, 2017

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class NormalCollectWin : Window

    {

        [SerializeField] SmoothSlider m_SmoothSlider;

        [SerializeField] Text m_Progress;

        [SerializeField] Text m_FairyFeastTip;



        DateTime endTime;

        float currentProgress = 0;



        public static PrepareHandler.ClientH0812 s_CollectInfo;



        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {



        }



        protected override void OnPreOpen()

        {

            currentProgress = 0f;



            m_SmoothSlider.ResetValue(0);



            m_Progress.text = StringUtility.Contact(currentProgress, "%");



            endTime = TimeUtility.ServerNow.AddMilliseconds(s_CollectInfo.MaxTime);



            var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            m_FairyFeastTip.gameObject.SetActive(mapId == 31230);

        }



        protected override void OnAfterOpen()

        {



        }



        protected override void OnPreClose()

        {

        }



        protected override void OnAfterClose()

        {

        }



        protected override void OnActived()

        {

            if (!PrepareHandler.Instance.isPreparing)

            {

                CloseClick();

            }

        }



        protected override void LateUpdate()

        {

            var progress = 1 - (float)(endTime - TimeUtility.ServerNow).TotalMilliseconds / s_CollectInfo.MaxTime;

            m_SmoothSlider.value = progress;



            progress = (float)Math.Round(progress * 100, 0);

            if (currentProgress != progress)

            {

                currentProgress = progress;

                m_Progress.text = StringUtility.Contact(currentProgress, "%");

            }



            if (currentProgress >= 1)

            {

                CloseImmediately();

            }

        }

        #endregion





    }



}










 System/Realm/NormalCollectWin.cs.meta

File was renamed from System/Realm/RealmCollectWin.cs.meta
@@ -1,12 +1,12 @@
fileFormatVersion: 2
guid: 750c734c2d7b6fc4c85368c8bbf4d499
timeCreated: 1507974546
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
fileFormatVersion: 2

guid: 750c734c2d7b6fc4c85368c8bbf4d499

timeCreated: 1507974546

licenseType: Free

MonoImporter:

  serializedVersion: 2

  defaultReferences: []

  executionOrder: 0

  icon: {instanceID: 0}

  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Realm/PlayerSitHandler.cs

New file
@@ -0,0 +1,37 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class PlayerSitHandler : Singleton<PlayerSitHandler>

{

    public bool isSit { get; private set; }



    public Dictionary<uint, byte> playerSitDict { get; private set; }



    public void ReceivePackage(H0411_tagPlayerSit vNetData)

    {

        if (playerSitDict == null)

        {

            playerSitDict = new Dictionary<uint, byte>();

        }

        playerSitDict[vNetData.PlayerID] = vNetData.Type;



        GActorPlayerBase playerBase = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;

        if (playerBase != null)

        {

            if (vNetData.Type == 0)

            {

                GA_Player player = playerBase as GA_Player;

                if (player != null)

                {

                    player.StopMoveToPosition();

                }

                playerBase.Dazuo();

            }

            else if (vNetData.Type == 1)

            {

                playerBase.IdleImmediate();

            }

        }

    }

}

 System/Realm/PlayerSitHandler.cs.meta

copy from System/Realm/RealmCollectWin.cs.meta
copy to System/Realm/PlayerSitHandler.cs.meta
File was copied from System/Realm/RealmCollectWin.cs.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 750c734c2d7b6fc4c85368c8bbf4d499
timeCreated: 1507974546
licenseType: Free
guid: 1b34b1d36e3ce9d42b77359b37c09df5
timeCreated: 1552289981
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []

 System/Realm/RealmCollectWin.cs

File was deleted