Fix conflix
This commit is contained in:
Binary file not shown.
@@ -2,8 +2,6 @@ using System;
|
||||
using UnityEngine;
|
||||
using CSNetwork;
|
||||
using PerfectWorld.Scripts.Managers.BrewMonster.Managers;
|
||||
using BrewMonster.Network;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
namespace BrewMonster
|
||||
{
|
||||
@@ -28,6 +26,7 @@ namespace BrewMonster
|
||||
public EC_ManMatter EC_ManMatter;
|
||||
public EC_ManPlayer GetECManPlayer { get => EC_ManPlayer;}
|
||||
public EC_ManMatter GetECManMatter { get => EC_ManMatter;}
|
||||
public CECNPCMan _CECNPCMan { get; private set; }
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
||||
@@ -154,6 +154,10 @@ namespace BrewMonster.Network
|
||||
{
|
||||
Instance._gameSession.RequestPickupItem(idItem, tid);
|
||||
}
|
||||
public static void RequestDropIvrtItem(byte index, int amount)
|
||||
{
|
||||
Instance._gameSession.RequestDropIvtrItem(index, amount);
|
||||
}
|
||||
public static void RequestAllInventoriesAsync(Action callback = null, params byte[] packages)
|
||||
{
|
||||
if (packages == null || packages.Length == 0)
|
||||
|
||||
Reference in New Issue
Block a user