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

client_linchunjie

2018-09-03 4fbd08375e073e7f8c8e85915697576549007c92

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

 Fight/Actor/AI/SampleAI.cs

@@ -85,7 +85,7 @@

    protected bool SearchActor = false;

    private void OnHpChange(uint value)
    private void OnHpChange(ulong value)
    {
        SearchActor = true;
    }

 Fight/Actor/HeroBehaviour.cs

@@ -806,7 +806,7 @@
                {

                    if (_target.ActorInfo.RealHp < _hurtValue)

                    {

                        _hurtValue = _target.ActorInfo.RealHp - 10;

                        _hurtValue = (uint)(_target.ActorInfo.RealHp - 10);

                    }

                }




 Fight/Actor/Skill/AttackHandler.cs

@@ -150,7 +150,7 @@
                    if (_pencent > 0.4f)

                    {

                        target.ActorInfo.ReduceHp((uint)_realHurt);

                        PlayerDatas.Instance.FightRefreshPlayerHp(target.ActorInfo.Hp);

                        PlayerDatas.Instance.FightRefreshPlayerHp((uint)target.ActorInfo.Hp);

                    }

                }

                else if (target is GA_NpcClientFightBoss)

@@ -184,7 +184,7 @@


                    if (target.ServerInstID == PlayerDatas.Instance.baseData.PlayerID)

                    {

                        PlayerDatas.Instance.FightRefreshPlayerHp(target.ActorInfo.RealHp);

                        PlayerDatas.Instance.FightRefreshPlayerHp((uint)target.ActorInfo.RealHp);

                    }

                }



@@ -1133,7 +1133,7 @@
        public uint clientInstID;

        public byte AttackType;

        public uint HurtHP;

        public uint CurHP;

        public ulong CurHP;

        public uint CurHPEx;

    }

}


 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -356,7 +356,7 @@
                // 主角血量扣除的补充

                if (_target.ServerInstID == PlayerDatas.Instance.PlayerId)

                {

                    PlayerDatas.Instance.FightRefreshPlayerHp(_target.ActorInfo.SyncServerHp);

                    PlayerDatas.Instance.FightRefreshPlayerHp((uint)_target.ActorInfo.SyncServerHp);

                }

            }




 Fight/GameActor/GA_Hero.cs

@@ -376,7 +376,7 @@
        }

    }



    public sealed override void RefreshLifeBar(uint value) { }

    public sealed override void RefreshLifeBar(ulong value) { }



    public override void RequestName()

    {


 Fight/GameActor/GA_NpcClientFightBoss.cs

@@ -69,7 +69,7 @@
        }
    }

    public override void RefreshLifeBar(uint value)
    public override void RefreshLifeBar(ulong value)
    {
        if (s_HpRefresh != null)
        {

 Fight/GameActor/GA_NpcClientFightNorm.cs

@@ -200,7 +200,7 @@
        m_LifeBar = LifeBar.RequireLifeBar(MP_Name, 0, CameraController.Instance.CameraObject);
    }

    public override void RefreshLifeBar(uint value)
    public override void RefreshLifeBar(ulong value)
    {
        if (m_LifeBar)
        {

 Fight/GameActor/GA_NpcFightBoss.cs

@@ -76,7 +76,7 @@
        }
    }

    public override void RefreshLifeBar(uint value)
    public override void RefreshLifeBar(ulong value)
    {
        // 非选中状态下不刷新
        if (s_HpRefresh != null)

 Fight/GameActor/GA_NpcFightNorm.cs

@@ -131,7 +131,7 @@
        m_LifeBar.Set(ActorInfo.RealHp, ActorInfo.RealMaxHp);

    }



    public override void RefreshLifeBar(uint value)

    public override void RefreshLifeBar(ulong value)

    {

        if (m_LifeBar)

        {


 Fight/GameActor/GA_NpcSummonFight.cs

@@ -47,7 +47,7 @@


    public sealed override void RequestLifeBar() { }

    public sealed override void ReleaseLifeBar() { }

    public sealed override void RefreshLifeBar(uint value) { }

    public sealed override void RefreshLifeBar(ulong value) { }



    public sealed override void RequestName() { }

    public sealed override void ReleaseName() { }


 Fight/GameActor/GA_Pet.cs

@@ -54,7 +54,7 @@


    public sealed override void RequestLifeBar() { }

    public sealed override void ReleaseLifeBar() { }

    public sealed override void RefreshLifeBar(uint value)

    public sealed override void RefreshLifeBar(ulong value)

    {

        //#if UNITY_EDITOR

        //        UnityEditor.EditorApplication.isPaused = true;


 Fight/GameActor/GA_Player.cs

@@ -526,7 +526,7 @@
        base.SwitchYellowName(on);

    }



    public sealed override void RefreshLifeBar(uint value)

    public sealed override void RefreshLifeBar(ulong value)

    {

        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero != null && _hero.SelectTarget == this)


 Fight/GameActor/GA_PlayerClient.cs

@@ -149,7 +149,7 @@
    {

    }



    public sealed override void RefreshLifeBar(uint value) { }

    public sealed override void RefreshLifeBar(ulong value) { }



    public sealed override void RequestName()

    {


 Fight/GameActor/GA_PlayerXMZZ.cs

@@ -175,7 +175,7 @@
    {

    }



    public sealed override void RefreshLifeBar(uint value)

    public sealed override void RefreshLifeBar(ulong value)

    {

        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero != null && _hero.SelectTarget == this)


 Fight/GameActor/GActorFight.cs

@@ -162,7 +162,7 @@
    public abstract bool CanAtked();

    public abstract bool CanAtkedRotate();



    public abstract void RefreshLifeBar(uint value);

    public abstract void RefreshLifeBar(ulong value);



    public void Die(uint killerServerInstID, int configID = 0)

    {


 Fight/GameActor/GActorInfo.cs

@@ -10,9 +10,9 @@
    public class PropValEx
    {
        // 当前值
        public uint val;
        public ulong val;
        // 最大值
        public uint max;
        public ulong max;
        // 扩展值
        public uint valEx;
        // 最大值扩展值
@@ -50,14 +50,14 @@
    /// <summary>
    /// 血量改变事件
    /// </summary>
    public event UnityAction<uint> OnHpChange;
    public event UnityAction<ulong> OnHpChange;
    /// <summary>
    /// 血量
    /// </summary>
    private PropValEx pveHp = new PropValEx();

    private uint _synchp;
    public uint SyncServerHp
    private ulong _synchp;
    public ulong SyncServerHp
    {
        get { return _synchp; }
        set
@@ -84,7 +84,7 @@
        }
    }// 服务端血量Ex的校准值

    public uint Hp
    public ulong Hp
    {
        get
        {
@@ -109,7 +109,7 @@
        }
    }

    public uint MaxHp
    public ulong MaxHp
    {
        get
        {
@@ -134,7 +134,7 @@
        }
    }

    public uint RealHp
    public ulong RealHp
    {
        get
        {
@@ -142,7 +142,7 @@
        }
    }

    public uint RealMaxHp
    public ulong RealMaxHp
    {
        get
        {

 System/HappyXB/HappyXBGetItemWin.cs

@@ -232,7 +232,7 @@
                     XBModel.SendOneXBQuest(PackType.rptTreasure, 1);

                    break;

                case HappXBTitle.Rune:

                    XBModel.SendOneXBQuest(PackType.rptRunePack, 2);

                    XBModel.SendOneXBQuest(PackType.rptTreasure, 2);

                    break;

            }

          

@@ -246,7 +246,7 @@
                    XBModel.SendXBManyQuest(PackType.rptTreasure, 1);

                    break;

                case HappXBTitle.Rune:

                    XBModel.SendXBManyQuest(PackType.rptRunePack, 2);

                    XBModel.SendXBManyQuest(PackType.rptTreasure, 2);

                    break;

            }

        }


 System/HappyXB/HappyXBModel.cs

@@ -543,6 +543,13 @@
                        return false;

                    }

                    break;

                case PackType.rptItem:

                    if (playerPack.GetReaminGridCount(type) < needGrid)

                    {

                        SysNotifyMgr.Instance.ShowTip("BagFull");

                        return false;

                    }

                    break;

            }

            return true;

        }


 System/HappyXB/RuneXBWin.cs

@@ -283,17 +283,17 @@
        bool isXBMany = false;

        private void ClickXBManyBtn()

        {

            XBModel.SendXBManyQuest(PackType.rptRunePack, 2);

            XBModel.SendXBManyQuest(PackType.rptTreasure, 2);

        }



        private void ClickXBBtn()

        {

            XBModel.SendOneXBQuest(PackType.rptRunePack, 2);

            XBModel.SendOneXBQuest(PackType.rptTreasure, 2);

        }



        private void ClickFreeXbBtn()

        {

            if (XBModel.CheckIsEmptyGrid(PackType.rptRunePack))

            if (XBModel.CheckIsEmptyGrid(PackType.rptTreasure))

            {

                XBModel.SendXBQuest(2, 0, 1);

            }


 System/HappyXB/XBGridCell.cs

@@ -1,6 +1,7 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using TableConfig;

namespace Snxxz.UI
{
@@ -39,15 +40,20 @@

        private void ClickItemCell(ItemModel itemModel)
        {
            if(playerPack.GetReaminGridCount(PackType.rptItem) > 0)
            {
                XBModel.SendPutOutXBItem(PackType.rptTreasure, PackType.rptItem, itemModel.itemInfo.ItemPlace, 0);
            if(itemModel.chinItemModel.Type == 30 || itemModel.chinItemModel.Type == 31)

            {

                if (XBModel.CheckIsEmptyGrid(PackType.rptRunePack))

                {

                    XBModel.SendPutOutXBItem(PackType.rptTreasure, PackType.rptRunePack, itemModel.itemInfo.ItemPlace, 0);

                }

            }
            else
            {
                SysNotifyMgr.Instance.ShowTip("BagFull");
            {

                if (XBModel.CheckIsEmptyGrid(PackType.rptItem))

                {

                    XBModel.SendPutOutXBItem(PackType.rptTreasure, PackType.rptItem, itemModel.itemInfo.ItemPlace, 0);

                }

            }
           
        }

        private void RefreshItemCount(PackType type, int index, int id)

 System/HappyXB/XBWarehouseWin.cs

@@ -186,15 +186,32 @@


        private void ClickPutOutBtn()

        {

            if (playerPack.GetReaminGridCount(PackType.rptItem) > 0)

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptTreasure);

            if (singlePack == null) return;

            Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict();

            bool isHaveItem = false;

            bool isHaveRune = false;

            foreach(var value in pairs.Values)

            {

                if(value.chinItemModel.Type == 30 || value.chinItemModel.Type == 31)

                {

                    isHaveRune = true;

                }

                else

                {

                    isHaveItem = true;

                }

                if(isHaveRune && isHaveItem)

                {

                    break;

                }

            }



            if((isHaveItem && XBModel.CheckIsEmptyGrid(PackType.rptItem))

                || (isHaveRune && XBModel.CheckIsEmptyGrid(PackType.rptRunePack)))

            {

                XBModel.SendPutOutXBItem(PackType.rptTreasure, PackType.rptItem, 0, 1);

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("BagFull");

            }

         
        }



    }


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -286,6 +286,10 @@


    void DefaultDialogue()//关于打开默认对话界面

    {

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)

        {

            return;

        }

        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        if (!WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>() && IsOpenMain)

        {