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

client_linchunjie

2019-03-27 87fab5b372b788c46f92d9699b24ecae6c7ffe8d

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

 Fight/GameActor/GA_NpcClientFightBoss.cs

@@ -21,6 +21,10 @@
        {
            m_AIHandler = new AI_BossFMT(this, BornPos);
        }
        else
        {
            m_AIHandler = new AI_Npc_200(this, BornPos);
        }
    }

    public override void OnSelect()

 Fight/Stage/MapEditor/Game/EventRefreshNPCHandler.cs

@@ -117,7 +117,14 @@
                }
                else
                {
                    _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(_data.npcID, E_ActorGroup.Enemy);
                    if (_npcConfig.IsBoss > 1)
                    {
                        _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightBoss>(_data.npcID, E_ActorGroup.Enemy);
                    }
                    else
                    {
                        _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(_data.npcID, E_ActorGroup.Enemy);
                    }
                }
                _npc.BornPos = _npc.Pos = _data.position;
                _npc.belongEventID = m_Evt.id;

 System/Auction/FamilyAuctioncell.cs

@@ -80,10 +80,10 @@
                {

                    m_HighestPriceImage.SetActive(true);

                }

                else

                {

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

                }

            }

            if (familyAuctionItem.BidderPrice != 0)

            {

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

            }

            else

            {


 System/Auction/FullServiceAuctioncell.cs

@@ -109,10 +109,11 @@
                {

                    m_HighestPriceImage.SetActive(true);

                }

                else

                {

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

                }

               
            }

            if (fullServiceAuction.BidderPrice != 0)

            {

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

            }

            else

            {


 System/Auction/MyFocusCell.cs

@@ -95,9 +95,13 @@
                else

                {

                    m_HighestPriceImage.SetActive(false);

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

                   
                }

            }

            if (myAuction.BidderPrice != 0)

            {

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

            }

            else

            {

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