Merge branch 'master' into HazyRegion_1

client_Hale

2019-05-23 16f9e691fce0669e87c84139489a93ad500b550b

Merge branch 'master' into HazyRegion_1

# Conflicts:
#	System/HazyRegion/HazyRegionModel.cs

 Fight/Actor/Skill/AttackHandler.cs

@@ -206,9 +206,10 @@


                    if (attacker is GA_NpcClientFightNorm)

                    {

                        if (target.ActorInfo.RealHp <= (target.ActorInfo.RealMaxHp * .5f))

                        if ((target.ActorInfo.RealHp - (ulong)realHurtValue) <= (target.ActorInfo.RealMaxHp * .5f))

                        {

                            hurtValue = 0;

                            realHurtValue = 0;

                        }

                    }

                    else if (target is GA_NpcClientFightNorm)

@@ -236,7 +237,14 @@


                    if (_doReduceHp)

                    {

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

                        if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)

                        {

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

                        }

                        else

                        {

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

                        }

                    }



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


 Fight/PrepareHandler.cs

@@ -281,6 +281,7 @@

                if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)
                {
                    WindowCenter.Instance.CloseImmediately("NormalCollectWin");
                    NormalCollectWin.s_CollectInfo = new ClientH0812()
                    {
                        PlayerID = PlayerDatas.Instance.PlayerId,

 Lua/Gen/SnxxzUIWingsRedDotModelWrap.cs

@@ -225,7 +225,6 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.redPointStre);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -255,7 +254,6 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.redPointStre = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);

 System/Alchemy/AlchemyUseDrugCell.cs

@@ -31,6 +31,9 @@
                ItemTipUtility.Show(itemId);

            });



            m_Item.countText.gameObject.SetActive(count > 0);

            m_Item.countText.text = count.ToString();



            var eatTimes = 0;



            AlchemyDrugUseLimit drugUseLimit;


 System/EquipStar/EquipStarModel.cs

@@ -713,7 +713,7 @@

        private void OnUpdate()
        {
            if (redpointDirty)
            if (redpointDirty && FuncOpen.Instance.IsFuncOpen(172))
            {
                redpointDirty = false;
                UpdateStarRedpoint();

 System/EquipTrain/EquipTrainModel.cs

@@ -728,7 +728,7 @@

        private void OnUpdate()
        {
            if (redpointDirty)
            if (redpointDirty && FuncOpen.Instance.IsFuncOpen(91))
            {
                redpointDirty = false;
                UpdateTrainRedpoint();

 System/EquipTrain/EquipTrainWin.cs

@@ -153,7 +153,7 @@
            if (force || model.equipTrainLevel.dirty)
            {
                var trainLevel = model.equipTrainLevel.Fetch();
                m_TrainLevel.text = string.Format("{0}级洗炼", trainLevel);
                m_TrainLevel.text = string.Format("{0}级洗炼", Mathf.Clamp(trainLevel, 0, int.MaxValue));
            }

            if (force || model.equipTrainMaxLevel.dirty)

 System/HazyRegion/HazyRegionModel.cs

@@ -1,8 +1,8 @@
using System;

using System.Collections;
using System.Collections.Generic;
using System.Collections;

using System.Collections.Generic;

using System.Text;

using UnityEngine;
using UnityEngine;

namespace Snxxz.UI

{

    [XLua.LuaCallCSharp]

@@ -123,7 +123,7 @@


            if (AdventureStage.Instance.IsInAdventureStage)

            {

                ClientDungeonStageUtility.RequestStartClientDungeon(0, 0, null);
                ClientDungeonStageUtility.RequestStartClientDungeon(0, 0, null);

            }



            UpdateRedpoint();

@@ -709,5 +709,5 @@
        DemonKing,

        ReikiGrass,

    }

}

}




 System/ItemDrop/DropItem.cs

@@ -13,11 +13,12 @@
    public static DropItem Drop(int _id, Vector3 _position, Camera _camera)

    {

        var dropItemType = ItemToDropType(_id);

        var _valiPos = _position;

        GActor.TryGetValidPos(_position, ref _valiPos);

        var _validPos = _position;

        GActor.TryGetValidPos(_position, ref _validPos);

        _validPos.y = _position.y;

        var dropItem = DropItemPool.RequireDropItem(dropItemType);

        dropItem.transform.SetParentEx(HUDCenter.hudRoot.dropItemCanvas.transform, Vector3.zero, Quaternion.identity, Vector3.one);

        dropItem.DropAt(_id, _valiPos, _camera);

        dropItem.DropAt(_id, _validPos, _camera);

        return dropItem;

    }




 System/ItemTip/ItemTipUtility.cs

@@ -893,7 +893,7 @@
                isEquiped = isEquiped,
                isPreview = false,
                score = item.score,
                isOverdue =ItemLogicUtility.Instance.IsOverdue(guid),
                isOverdue = ItemLogicUtility.Instance.IsOverdue(guid),
                auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
                overdueSurplusTime = item.overdueSurplusTime,
                levelLimit = item.isAuction ? 0 : item.config.UseLV,
@@ -911,6 +911,11 @@
            var baseProperties = new List<Int2>();
            var config = ItemConfig.Get(itemId);

            if (config.Effect1 == 220)

            {

                return GetBaseProperty(config.EffectValueA1);

            }

            if (!ItemLogicUtility.Instance.IsDogzEquip(itemId))

            {

                if (config.Effect1 != 0)


 System/Strengthening/WingsRedDotModel.cs

@@ -16,7 +16,6 @@
    public class WingsRedDotModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
    {
        private const int Redpoint_key = 10603;
        public Redpoint redPointStre = new Redpoint(MainRedDot.RedPoint_key1, Redpoint_key);
        private int WingNumber = 0;//翅膀数量标记
        private int Marking = 0;
        private bool IsOnePutOn = true;
@@ -77,7 +76,6 @@
        private List<WingRefineAttrConfig> WingRefineAttr = new List<WingRefineAttrConfig>();
        public void WingsDot()
        {
            redPointStre.state = RedPointState.None;
            ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);

            if (itemModel == null || !FuncOpen.Instance.IsFuncOpen(90))
@@ -157,7 +155,6 @@
            if (WingNumber > Marking && FuncOpen.Instance.IsFuncOpen(90))
            {
                Marking = WingNumber;
                redPointStre.state = RedPointState.Simple;
                return;
            }
            else
@@ -200,7 +197,6 @@
                if (ItemCount > _dicWings[ItemIndex].WingsCount)
                {
                    _dicWings[ItemIndex].WingsCount = ItemCount;
                    redPointStre.state = RedPointState.Simple;
                }
                else
                {
@@ -216,9 +212,8 @@
                if (WingItem != null && _dicWings.ContainsKey(Index))
                {
                    _dicWings.Remove(Index);
                    if (_dicWings.Count <= 0 && redPointStre.state == RedPointState.Simple)
                    if (_dicWings.Count <= 0 )
                    {
                        redPointStre.state = RedPointState.None;
                        return;
                    }
                }
@@ -226,9 +221,8 @@
            if (arg1 == PackType.Equip)//装备脱下
            {
                ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);
                if (itemModel == null && redPointStre.state == RedPointState.Simple)
                if (itemModel == null )
                {
                    redPointStre.state = RedPointState.None;
                    return;
                }
            }