Merge branch 'master' into HazyRegion_1

client_linchunjie

2019-05-22 1a755c6befb41bfe28d6be740e2b2321f3ab3b5e

Merge branch 'master' into HazyRegion_1

 Fight/ClientCollectUtility.cs

@@ -90,16 +90,13 @@

    public static void Init()
    {
        NPCInteractProcessor.s_NpcInteractEvent -= HandleCallback;
        NPCInteractProcessor.s_NpcInteractEvent += HandleCallback;

        WindowCenter.Instance.windowAfterOpenEvent -= CheckOpenCollectIcon;
        WindowCenter.Instance.windowAfterOpenEvent += CheckOpenCollectIcon;
        WindowCenter.Instance.windowAfterCloseEvent -= CheckCloseCollectIcon;
        WindowCenter.Instance.windowAfterCloseEvent += CheckCloseCollectIcon;
    }

    private static void HandleCallback(E_NpcType type, int npcID, uint sid)
    public static void HandleCallback(E_NpcType type, int npcID, uint sid)
    {
        var _hero = PlayerDatas.Instance.hero;
        if (_hero != null)
@@ -178,8 +175,6 @@

    public static void UnInit()
    {
        NPCInteractProcessor.s_NpcInteractEvent -= HandleCallback;

        WindowCenter.Instance.windowAfterOpenEvent -= CheckOpenCollectIcon;
        WindowCenter.Instance.windowAfterCloseEvent -= CheckCloseCollectIcon;
    }

 System/Dungeon/DungeonSuppliesLackWin.cs

@@ -228,7 +228,7 @@
                case LackType.ElderGodArea:

                case LackType.FairyLand:

                case LackType.SingleIceCrystal:

                    return Language.Get("JadeChargeAgainst", _moneyNeed, _moneyOwn);

                    return Language.Get("JadeChargeAgainst", _moneyNeed);

                case LackType.Kylin:

                case LackType.IceCrystal:

                    var lackItem = GetLackItem(_lackType);


 System/MainInterfacePanel/MainCollectBehaviour.cs

@@ -82,7 +82,15 @@
        {

            if (collectNpcId != 0 && serverInstanceId != 0)

            {

                PrepareHandler.Instance.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);

                var _npc = GAMgr.Instance.GetBySID(serverInstanceId);

                if (_npc is GA_NpcCollect)

                {

                    PrepareHandler.Instance.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);

                }

                else if (_npc is GA_NpcClientCollect)

                {

                    ClientCollectUtility.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);

                }

                // NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, collectNpcId, serverInstanceId);

            }

        }


 System/Team/TeamDungeonTicketLackWin.cs

@@ -153,7 +153,7 @@
            switch (_lackType)

            {

                case LackType.FairyLand:

                    return Language.Get("JadeChargeAgainst", _moneyNeed, _moneyOwn);

                    return Language.Get("JadeChargeAgainst", _moneyNeed);

                default:

                    return string.Empty;

            }


 System/Treasure/FairyTreasureCollectPanelPattern3.cs

@@ -72,6 +72,10 @@
                    }

                    break;

                case 305:

                    m_GotoBtnText.text = Language.Get("FairyTreasureGot");

                    m_ContainerLocked.gameObject.SetActive(false);

                    m_AddedEffect.text = Language.Get("FairyTreasure_12", model.treasureAddReikiPoint.y);

                    break;

                case 306:

                case 307:

                case 308:

@@ -94,6 +98,9 @@
                            case 18:

                                m_AddedEffect.text = Language.Get("FairyTreasure_9", _property.Value / 100);

                                break;

                            case 37:

                                m_AddedEffect.text = Language.Get("FairyTreasure_11", _property.Value / 100);

                                break;

                        }

                    }

                    break;


 System/Treasure/TreasureModel.cs

@@ -148,6 +148,8 @@


        public int displayInductionId { get; private set; }



        public Int2 treasureAddReikiPoint { get; private set; }



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



        VIPKillNPCTreasure m_VIPKillNPCTreasure;

@@ -306,6 +308,9 @@
            funcConfig = FuncConfigConfig.Get("OpenFabao");

            entranceOpenCondition = int.Parse(funcConfig.Numerical1);



            funcConfig = FuncConfigConfig.Get("FabaoAddPoint");

            treasureAddReikiPoint = new Int2(int.Parse(funcConfig.Numerical1), int.Parse(funcConfig.Numerical2));



            var treasureDungeonConfigs = TreasureDungeonConfig.GetValues();

            foreach (var config in treasureDungeonConfigs)

            {