diff --git a/.idea/.idea.perfect-world-unity/.idea/indexLayout.xml b/.idea/.idea.perfect-world-unity/.idea/indexLayout.xml new file mode 100644 index 0000000000..7b08163ceb --- /dev/null +++ b/.idea/.idea.perfect-world-unity/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Common/DataProcess/globaldataman.cs b/Assets/PerfectWorld/Scripts/Common/DataProcess/globaldataman.cs new file mode 100644 index 0000000000..882cef3a0e --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Common/DataProcess/globaldataman.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.IO; +using UnityEngine; + +[System.Serializable] +public struct GShopBuyOption +{ + public uint price; // Item price + public uint endTime; // End time (year/month/day/hour/minute/second) + public uint time; // Duration in seconds (0 = permanent) + public uint startTime; // Start time + public int type; // Time type: 0=permanent, 1=weekly, 2=monthly, -1=invalid + public uint day; // Day mask for weekly/monthly + public uint status; // Item status: 0=none, 1=hot, 2=new, 3=recommended, 4-12=discount levels, 13=sold out + public uint flag; // Additional flags +} + +[System.Serializable] +public struct GShopItem +{ + public int localId; // Localization ID + public int mainType; // Main category index + public int subType; // Sub-category index + public string icon; // Icon file path (128 chars) + public uint id; // Item object ID + public uint num; // Item quantity + public GShopBuyOption[] buy; // Up to 4 different pricing options + public string desc; // Item description (512 chars) + public string name; // Item display name (32 chars) + public uint idGift; // Gift item ID + public uint giftNum; // Gift quantity + public uint giftTime; // Gift duration + public uint logPrice; // Log price + public uint[] ownerNpcs; // NPCs that own this item (8 max) +} + +[System.Serializable] +public struct GShopMainType +{ + public string name; // Main category name (64 chars) + public List subTypes; // Sub-category names +} + +public class GShopData +{ + public List items; + public List mainTypes; + public uint timestamp; + + public GShopData() + { + items = new List(); + mainTypes = new List(); + timestamp = 0; + } +} + +// Extension methods for BinaryReader +public static class BinaryReaderExtensions +{ + public static string ReadString(this BinaryReader reader, int length) + { + byte[] bytes = reader.ReadBytes(length); + return System.Text.Encoding.UTF8.GetString(bytes).TrimEnd('\0'); + } + + public static string ReadWideString(this BinaryReader reader, int length) + { + byte[] bytes = reader.ReadBytes(length * 2); // Wide chars are 2 bytes each + return System.Text.Encoding.Unicode.GetString(bytes).TrimEnd('\0'); + } +} \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Common/DataProcess/globaldataman.cs.meta b/Assets/PerfectWorld/Scripts/Common/DataProcess/globaldataman.cs.meta new file mode 100644 index 0000000000..3bd13722c1 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Common/DataProcess/globaldataman.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7a383c75c23026f4097fb53388429788 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/GameData/GShopLoader.cs b/Assets/PerfectWorld/Scripts/GameData/GShopLoader.cs new file mode 100644 index 0000000000..ca395265d2 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/GameData/GShopLoader.cs @@ -0,0 +1,210 @@ +using System; +using System.Collections.Generic; +using System.IO; +using UnityEngine; + +public class GShopLoader : MonoBehaviour +{ + [Header("File Paths")] + public string gshopDataPath = "gshop.data"; + public string gshop1DataPath = "gshop1.data"; + + [Header("Loaded Data")] + public GShopData primaryShop = new GShopData(); + public GShopData secondaryShop = new GShopData(); + + void Start() + { + LoadGShopData(); + } + + public void LoadGShopData() + { + Debug.Log("=== Loading GShop Data ==="); + + // Load primary shop + if (LoadShopData(gshopDataPath, primaryShop)) + { + Debug.Log($"Primary shop loaded: {primaryShop.items.Count} items, {primaryShop.mainTypes.Count} categories"); + LogShopData("Primary Shop", primaryShop); + } + + // Load secondary shop + if (LoadShopData(gshop1DataPath, secondaryShop)) + { + Debug.Log($"Secondary shop loaded: {secondaryShop.items.Count} items, {secondaryShop.mainTypes.Count} categories"); + LogShopData("Secondary Shop", secondaryShop); + } + } + + private bool LoadShopData(string filePath, GShopData shopData) + { + try + { + string fullPath = Path.Combine(Application.streamingAssetsPath, filePath); + + if (!File.Exists(fullPath)) + { + Debug.LogError($"GShop file not found: {fullPath}"); + return false; + } + + using (FileStream fs = new FileStream(fullPath, FileMode.Open, FileAccess.Read)) + using (BinaryReader reader = new BinaryReader(fs)) + { + // Read timestamp + shopData.timestamp = reader.ReadUInt32(); + Debug.Log($"Timestamp: 0x{shopData.timestamp:X8}"); + + // Read number of items + int itemCount = reader.ReadInt32(); + Debug.Log($"Item count: {itemCount}"); + + // Read all items + for (int i = 0; i < itemCount; i++) + { + GShopItem item = ReadGShopItem(reader); + shopData.items.Add(item); + } + + // Read 8 main types + for (int i = 0; i < 8; i++) + { + GShopMainType mainType = ReadGShopMainType(reader); + shopData.mainTypes.Add(mainType); + } + } + + return true; + } + catch (Exception e) + { + Debug.LogError($"Error loading GShop data from {filePath}: {e.Message}"); + return false; + } + } + + private GShopItem ReadGShopItem(BinaryReader reader) + { + GShopItem item = new GShopItem(); + + item.localId = reader.ReadInt32(); + item.mainType = reader.ReadInt32(); + item.subType = reader.ReadInt32(); + + // Read icon path (128 chars) + item.icon = reader.ReadString(128); + + item.id = reader.ReadUInt32(); + item.num = reader.ReadUInt32(); + + // Read buy options (4 options) + item.buy = new GShopBuyOption[4]; + for (int i = 0; i < 4; i++) + { + item.buy[i] = new GShopBuyOption + { + price = reader.ReadUInt32(), + endTime = reader.ReadUInt32(), + time = reader.ReadUInt32(), + startTime = reader.ReadUInt32(), + type = reader.ReadInt32(), + day = reader.ReadUInt32(), + status = reader.ReadUInt32(), + flag = reader.ReadUInt32() + }; + } + + // Read description (512 wide chars) + item.desc = reader.ReadWideString(512); + + // Read name (32 wide chars) + item.name = reader.ReadWideString(32); + + item.idGift = reader.ReadUInt32(); + item.giftNum = reader.ReadUInt32(); + item.giftTime = reader.ReadUInt32(); + item.logPrice = reader.ReadUInt32(); + + // Read owner NPCs (8 max) + item.ownerNpcs = new uint[8]; + for (int i = 0; i < 8; i++) + { + item.ownerNpcs[i] = reader.ReadUInt32(); + } + + return item; + } + + private GShopMainType ReadGShopMainType(BinaryReader reader) + { + GShopMainType mainType = new GShopMainType(); + + // Read main type name (64 wide chars) + mainType.name = reader.ReadWideString(64); + + // Read number of sub-types + int subTypeCount = reader.ReadInt32(); + mainType.subTypes = new List(); + + // Read sub-types + for (int i = 0; i < subTypeCount; i++) + { + string subTypeName = reader.ReadWideString(64); + mainType.subTypes.Add(subTypeName); + } + + return mainType; + } + + private void LogShopData(string shopName, GShopData shopData) + { + Debug.Log($"=== {shopName} Information ==="); + Debug.Log($"Timestamp: 0x{shopData.timestamp:X8}"); + Debug.Log($"Total Items: {shopData.items.Count}"); + Debug.Log($"Total Categories: {shopData.mainTypes.Count}"); + + // Log categories + Debug.Log("--- Categories ---"); + for (int i = 0; i < shopData.mainTypes.Count; i++) + { + var category = shopData.mainTypes[i]; + Debug.Log($"Category {i}: {category.name}"); + foreach (var subType in category.subTypes) + { + Debug.Log($" - {subType}"); + } + } + + // Log first 10 items as sample + Debug.Log("--- Sample Items (First 10) ---"); + int sampleCount = Mathf.Min(10, shopData.items.Count); + for (int i = 0; i < sampleCount; i++) + { + var item = shopData.items[i]; + Debug.Log($"Item {i}:"); + Debug.Log($" ID: {item.id}, Name: {item.name}"); + Debug.Log($" MainType: {item.mainType}, SubType: {item.subType}"); + Debug.Log($" Quantity: {item.num}"); + Debug.Log($" Icon: {item.icon}"); + Debug.Log($" Description: {item.desc}"); + + // Log buy options + for (int j = 0; j < 4; j++) + { + var buyOption = item.buy[j]; + if (buyOption.price > 0) + { + Debug.Log($" Buy Option {j}: Price={buyOption.price}, Status={buyOption.status}"); + } + } + + if (item.idGift > 0) + { + Debug.Log($" Gift: ID={item.idGift}, Num={item.giftNum}"); + } + } + + Debug.Log($"=== End {shopName} Information ==="); + } +} \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/GameData/GShopLoader.cs.meta b/Assets/PerfectWorld/Scripts/GameData/GShopLoader.cs.meta new file mode 100644 index 0000000000..c737a82bb2 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/GameData/GShopLoader.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 20694866a3163b342953396044c25a4e \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs index 59f5c69bbf..205716958a 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs @@ -87,6 +87,7 @@ namespace PerfectWorld.Scripts.Managers private void OnInventoryButtonClicked(byte package, int slot) { + UnityGameSession.RequestCheckSecurityPassWd(""); var data = model.GetInventoryData(package); if (data != null && data.TryGetValue(slot, out var itemData)) { diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem.cs b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem.cs index 7b63d045a0..0bddbb4d2e 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem.cs @@ -286,25 +286,25 @@ namespace PerfectWorld.Scripts.Managers var t = data.GetType(); // Debug: Log all available fields and properties - Debug.Log($"[Inventory] Data type: {t.Name}"); + // Debug.Log($"[Inventory] Data type: {t.Name}"); var fields = t.GetFields(BindingFlags.Public | BindingFlags.Instance); - foreach (var f in fields) - { - Debug.Log($"[Inventory] Field: {f.Name} ({f.FieldType.Name})"); - } + // foreach (var f in fields) + // { + // Debug.Log($"[Inventory] Field: {f.Name} ({f.FieldType.Name})"); + // } var props = t.GetProperties(BindingFlags.Public | BindingFlags.Instance); - foreach (var p in props) - { - Debug.Log($"[Inventory] Property: {p.Name} ({p.PropertyType.Name})"); - } + // foreach (var p in props) + // { + // Debug.Log($"[Inventory] Property: {p.Name} ({p.PropertyType.Name})"); + // } var methods = t.GetMethods(BindingFlags.Public | BindingFlags.Instance); - foreach (var m in methods) - { - if (m.Name.ToLower().Contains("name") || m.Name.ToLower().Contains("getname")) - { - Debug.Log($"[Inventory] Method: {m.Name} ({m.ReturnType.Name})"); - } - } + // foreach (var m in methods) + // { + // if (m.Name.ToLower().Contains("name") || m.Name.ToLower().Contains("getname")) + // { + // Debug.Log($"[Inventory] Method: {m.Name} ({m.ReturnType.Name})"); + // } + // } // Prefer decoding the raw fields first to control encoding (Unicode for Vietnamese), // then fall back to any string properties if needed. diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs b/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs index 863fb742f4..9b8e607b73 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs @@ -56,7 +56,7 @@ namespace PerfectWorld.Scripts.Managers { Debug.Log("MATTERINFO"); //ENABLE LATER: It fetch all matters in the game world, causing performance issues - //OnMsgMatterInfo(Msg); + OnMsgMatterInfo(Msg); break; } case int value when value == EC_MsgDef.MSG_MM_MATTERENTWORLD: @@ -83,9 +83,9 @@ namespace PerfectWorld.Scripts.Managers // Parse the data structure: count + info_matter array int offset = 0; - // Read count (int) - int count = BitConverter.ToInt32(data, offset); - offset += sizeof(int); + // Read count (ushort) + ushort count = BitConverter.ToUInt16(data, offset); + offset += sizeof(ushort); Debug.Log($"MATTERINFO: Received {count} matter entries"); @@ -136,6 +136,13 @@ namespace PerfectWorld.Scripts.Managers private void SpawnMatterCube(int matterId) { + // Check if matter is within 1000 units of the host player + /*if (!IsMatterWithinPlayerRange(matterId, 10000f)) + { + Debug.Log($"Matter {matterId} is too far from player, skipping spawn"); + return; + }*/ + // Find the pickupItem component in the scene and create cube for this specific matter pickupItem pickupScript = UnityEngine.Object.FindFirstObjectByType(); if (pickupScript != null) @@ -150,6 +157,13 @@ namespace PerfectWorld.Scripts.Managers private void NotifyPickupItem(int matterId) { + // Check if matter is within 1000 units of the host player + if (!IsMatterWithinPlayerRange(matterId, 1000f)) + { + Debug.Log($"Matter {matterId} is too far from player, skipping notification"); + return; + } + // Find the pickupItem component in the scene and update cubes pickupItem pickupScript = UnityEngine.Object.FindFirstObjectByType(); if (pickupScript != null) @@ -157,6 +171,43 @@ namespace PerfectWorld.Scripts.Managers pickupScript.UpdateMatterCubes(); } } + + /// + /// Check if a matter is within the specified distance from the host player + /// + /// The matter ID to check + /// Maximum distance in Unity units + /// True if matter is within range, false otherwise + private bool IsMatterWithinPlayerRange(int matterId, float maxDistance) + { + // Get the matter data + if (!matterDataStorage.TryGetValue(matterId, out info_matter matterData)) + { + Debug.LogWarning($"Matter data not found for ID: {matterId}"); + return false; + } + + // Get the host player + var hostPlayer = GameController.Instance?.GetHostPlayer(); + if (hostPlayer == null) + { + Debug.LogWarning("Host player not found"); + return false; + } + + // Convert matter position to Unity Vector3 + Vector3 matterPosition = new Vector3(matterData.pos.x, matterData.pos.y, matterData.pos.z); + + // Get player position + Vector3 playerPosition = hostPlayer.transform.position; + + // Calculate distance + float distance = Vector3.Distance(matterPosition, playerPosition); + + Debug.Log($"Matter {matterId} distance from player: {distance:F2} units (max: {maxDistance})"); + + return distance <= maxDistance; + } // Public methods for players to access matter data public info_matter? GetMatterData(int matterId) diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs index 1b516eac83..bf7772adde 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs @@ -915,7 +915,7 @@ namespace CSNetwork.GPDataType [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct cmd_matter_info_list { - public int count; + public ushort count; public info_matter Info; } [StructLayout(LayoutKind.Sequential, Pack = 1)] diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/NetworkManager.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/NetworkManager.cs index ce7d352b98..1dca8a8da7 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/NetworkManager.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/NetworkManager.cs @@ -253,6 +253,7 @@ namespace CSNetwork _logger.Log(LogType.Info, "Send loop finished."); } + private int _previousLength; // Internal task to read from network and process data private async Task ProcessReceivedData(CancellationToken token) { @@ -303,6 +304,9 @@ namespace CSNetwork _receiveOctets.Capacity - currentBufferLength, token ); + + + // _logger.Log(LogType.Info, $"ProcessReceivedData:: Buffer remaining data size: {currentBufferLength} -- Raw first byte: {_receiveOctets.RawBuffer[0]}"); } catch (IOException ex) when (ex.InnerException is SocketException se @@ -334,10 +338,10 @@ namespace CSNetwork currentBufferLength += bytesRead; _receiveOctets.SetSize(currentBufferLength); - _logger.Log(LogType.Info, $"Process Buffer:: Read {bytesRead} bytes -- Token: {token.GetHashCode()}"); + _logger.Log(LogType.Info, $"BF Process Buffer:: Read {bytesRead} bytes -- Total size: {currentBufferLength}"); // Process the data currently in the buffer ProcessBuffer(); - + _logger.Log(LogType.Info, $"AF Process Buffer:: Read {bytesRead} bytes -- Total size: {currentBufferLength}"); // After processing, the buffer might have been compacted, update length currentBufferLength = _receiveOctets.Length; } @@ -386,8 +390,10 @@ namespace CSNetwork 0, originalBlockLength ); + _logger.Log(LogType.Info, $"ProcessBuffer:: raw first byte {currentData.RawBuffer[0]} - Length: {currentData.Length}"); // Update returns a NEW Octets object with processed data dataToProcess = currentIsec!.Update(currentData); + _logger.Log(LogType.Info, $"ProcessBuffer:: decompressed first byte {dataToProcess.RawBuffer[0]} - Length: {dataToProcess.Length}"); // _logger.Log(LogType.Info, $"Input security applied. Original size: {originalBlockLength}, Processed size: {dataToProcess.Length}"); } catch (Exception ex) @@ -411,6 +417,7 @@ namespace CSNetwork bool processedAnyProtocols = false; int totalConsumedFromProcessedStream = 0; // Track total bytes consumed *from the processed stream* + Protocol._logger = _logger; while (processingStream.Position < dataToProcess.Length) { int streamPosBeforeDecode = processingStream.Position; @@ -418,6 +425,7 @@ namespace CSNetwork try { + //_logger.Log(LogType.Info, $"First byte of the stream: {processingStream.RawBuffer[0]}"); (p, consumedBytes) = Protocol.Decode(processingStream, IgnoreBytes); // Decode returns protocol and bytes consumed } catch (Exception e) diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs index f2228129c9..9268408d89 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs @@ -8,7 +8,7 @@ namespace CSNetwork.Protocols { public abstract class Protocol { - private static readonly IPrefixedLogger _logger = LoggerFactory.GetLogger(nameof(Protocol)); + public static IPrefixedLogger _logger = LoggerFactory.GetLogger(nameof(Protocol)); public uint Type { get; protected set; } public ProtocolType GetPType() => (ProtocolType)Type; private static readonly Dictionary _protocolMap = new Dictionary(); @@ -169,7 +169,7 @@ namespace CSNetwork.Protocols private const int MaxProtocolSize = 16 * 1024 * 1024; // 16MB max size - public virtual string ToString => $"Protocol Type: {Type}"; + public virtual string ToString => $"Protocol Type: {Type}"; } // Add interface for marshallable objects diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Security/DecompressArcFourSecurity.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Security/DecompressArcFourSecurity.cs index f4fb07920f..769a67a446 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Security/DecompressArcFourSecurity.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Security/DecompressArcFourSecurity.cs @@ -45,6 +45,8 @@ namespace CSNetwork.Security { if (data == null || data.Length == 0) { + _logger.Log(LogType.Debug,$"HoangDev: AF _arcFour data{data.RawBuffer[0]} - Length: {data.Length}"); + return new Octets(); // Return empty if input is empty } // 1. Decrypt using ARCFour @@ -55,7 +57,9 @@ namespace CSNetwork.Security // or just to be safe. Ensure _arcFour.Update returns a *new* Octets. // *** If ARCFourSecurity.Update modified the input Octets in-place, this would be wrong. *** // *** Assuming ARCFourSecurity.Update follows the abstract Security pattern and returns new Octets *** - decryptedData = _arcFour.Update(data); + decryptedData = _arcFour.Update(data); + _logger.Log(LogType.Debug,$"HoangDev: AF _arcFour data{decryptedData.RawBuffer[0]} - Length: {decryptedData.Length}"); + } catch (Exception ex) { @@ -75,7 +79,7 @@ namespace CSNetwork.Security try { decompressedData = decompressor.Update(decryptedData); - //_logger.Log(LogType.Debug, $"Decompressed {decryptedData.Length} bytes to {decompressedData.Length} bytes. Decompressed Data: {decompressedData.ToString()}"); + _logger.Log(LogType.Debug, $"Decompressed {decryptedData.Length} bytes to {decompressedData.Length} bytes. Decompressed Data: {decompressedData.ToString()}"); } catch (Exception ex) { diff --git a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs index 07f37b5c83..2938b25ff1 100644 --- a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs @@ -156,6 +156,10 @@ namespace BrewMonster.Network { Instance._gameSession.RequestDropIvtrItem(index, amount); } + public static void RequestCheckSecurityPassWd(string password) + { + Instance._gameSession.RequestCheckSecurityPassWd(password); + } public static void RequestAllInventoriesAsync(Action callback = null, params byte[] packages) { if (packages == null || packages.Length == 0) diff --git a/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs b/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs index 195131274a..b0622b5cd5 100644 --- a/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs +++ b/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs @@ -35,6 +35,9 @@ namespace BrewMonster.UI { _loginButton.onClick.AddListener(OnLoginButtonClicked); context = SynchronizationContext.Current; + + _usernameInputField.text = PlayerPrefs.GetString("username", ""); + _passwordInputField.text = PlayerPrefs.GetString("password", ""); } // Update is called once per frame @@ -67,6 +70,9 @@ namespace BrewMonster.UI string username = _usernameInputField.text; string password = _passwordInputField.text; UnityGameSession.SetConnectionInfo("103.182.22.52", 29000); + PlayerPrefs.SetString("username", username); + PlayerPrefs.SetString("password", password); + PlayerPrefs.Save(); await UnityGameSession.Login(username, password, OnLoginComplete); } @@ -143,7 +149,7 @@ namespace BrewMonster.UI await Task.Delay(2000); // Request all known packages: 0=Inventory,1=Equipment,2=Task UnityGameSession.RequestAllInventoriesAsync(() => { BMLogger.Log("Sent Inventory Detail Requests (all packs)"); }, 0, 1, 2); - + UnityGameSession.RequestCheckSecurityPassWd(""); await Task.Delay(2000); UnityGameSession.c2s_CmdGetAllData(true, true, false); EC_Game.Init(); diff --git a/Assets/PerfectWorld/Scripts/UI/pickupItem.cs b/Assets/PerfectWorld/Scripts/UI/pickupItem.cs index 6127acf62c..743955aec6 100644 --- a/Assets/PerfectWorld/Scripts/UI/pickupItem.cs +++ b/Assets/PerfectWorld/Scripts/UI/pickupItem.cs @@ -10,9 +10,26 @@ using TMPro; public class pickupItem : MonoBehaviour { - public InputField mid; - public InputField tid; - public Button send; + // Singleton instance + private static pickupItem _instance; + public static pickupItem Instance + { + get + { + if (_instance == null) + { + _instance = FindFirstObjectByType(); + if (_instance == null) + { + // Create a new GameObject with pickupItem component if none exists + GameObject pickupManager = new GameObject("PickupManager"); + _instance = pickupManager.AddComponent(); + DontDestroyOnLoad(pickupManager); + } + } + return _instance; + } + } // Dictionary to store created cubes with their matter IDs private Dictionary matterCubes = new Dictionary(); @@ -29,10 +46,17 @@ public class pickupItem : MonoBehaviour // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { - // Add button click listener - if (send != null) + // Ensure this is the singleton instance + if (_instance == null) { - send.onClick.AddListener(OnPickupButtonClicked); + _instance = this; + DontDestroyOnLoad(gameObject); + } + else if (_instance != this) + { + // If another instance already exists, destroy this one + Destroy(gameObject); + return; } // Get reference to matter manager @@ -148,7 +172,7 @@ public class pickupItem : MonoBehaviour // Create cube GameObject GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube); cube.name = $"Matter_{matterData.Value.mid}_TID_{matterData.Value.tid}"; - cube.transform.localScale = new Vector3(0.3f, 0.3f, 0.3f); + cube.transform.localScale = new Vector3(1f, 1f, 1f); // Position the cube based on matter position Vector3 position = new Vector3( matterData.Value.pos.x, @@ -347,36 +371,9 @@ public class pickupItem : MonoBehaviour return pickedUpItems.Count; } - private void OnPickupButtonClicked() - { - // Validate input fields - if (mid == null || tid == null) - { - Debug.LogError("PickupItem: Mid or Tid InputField is not assigned!"); - return; - } - - // Parse the input values - if (int.TryParse(mid.text, out int midValue) && int.TryParse(tid.text, out int tidValue)) - { - // Call the pickup item request - UnityGameSession.RequestPickupItem(midValue, tidValue); - Debug.Log($"Pickup request sent - MID: {midValue}, TID: {tidValue}"); - } - else - { - Debug.LogError("PickupItem: Invalid input values. Please enter valid integers for MID and TID."); - } - } private void OnDestroy() { - // Clean up button listener - if (send != null) - { - send.onClick.RemoveListener(OnPickupButtonClicked); - } - // Clean up all matter cubes foreach (var kvp in matterCubes) { diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab index 89281d5070..afd6358610 100644 --- a/Assets/Prefabs/UI/InventoryUI.prefab +++ b/Assets/Prefabs/UI/InventoryUI.prefab @@ -33,10 +33,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -152.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5545619545754106273 CanvasRenderer: @@ -153,10 +153,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7166820878650541780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 588.35, y: -59.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9112205963990496432 CanvasRenderer: @@ -273,10 +273,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -40} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4677471626050105789 CanvasRenderer: @@ -392,9 +392,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3250574652249393354} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52.65755, y: -446.15002} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 86, y: 81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5972748370309725437 @@ -468,10 +468,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7166820878650541780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 479.18, y: -59.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3997873020355048166 CanvasRenderer: @@ -729,10 +729,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7166820878650541780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 370.01, y: -59.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4479228720555407959 CanvasRenderer: @@ -849,10 +849,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -340} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1477968227699865104 CanvasRenderer: @@ -969,10 +969,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -346.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5444752522567717671 CanvasRenderer: @@ -1089,10 +1089,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -240} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9118632706171397699 CanvasRenderer: @@ -1209,10 +1209,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 416, y: -540} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133399526784008930 CanvasRenderer: @@ -1329,9 +1329,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4359352035478671586} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92.65, y: -36.303} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 185.3, y: 72.606} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6580926924470282336 @@ -1449,10 +1449,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -540.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3390171394659288319 CanvasRenderer: @@ -1568,9 +1568,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6394577350856306769} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40.34195, y: -38.9523} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 80.6839, y: 77.9046} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3597099031460827275 @@ -1705,10 +1705,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -540} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5261477976888633999 CanvasRenderer: @@ -2040,10 +2040,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -443.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &398940925158379595 CanvasRenderer: @@ -2296,10 +2296,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -40} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5629281106801473515 CanvasRenderer: @@ -2416,10 +2416,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -440} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7325613977595877506 CanvasRenderer: @@ -2536,10 +2536,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -540} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6988331312543253804 CanvasRenderer: @@ -2657,9 +2657,9 @@ RectTransform: - {fileID: 1196048798379155334} m_Father: {fileID: 2881893989559991082} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 103.49395, y: -51.2791} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 206.9879, y: 58.067} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3607970195328321953 @@ -2733,10 +2733,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 416, y: -140} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4299144622337523607 CanvasRenderer: @@ -2853,10 +2853,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -140} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &274414751659608558 CanvasRenderer: @@ -3108,9 +3108,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 9128617693675511206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275.465, y: -662.18506} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 550.93, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6627002509346428102 @@ -3183,9 +3183,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3250574652249393354} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52.65755, y: -547.15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 73, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8815580278194564077 @@ -3259,10 +3259,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -55.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7150249601528777707 CanvasRenderer: @@ -3515,10 +3515,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -240} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &701096444390782419 CanvasRenderer: @@ -3635,10 +3635,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7166820878650541780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42.5, y: -59.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7052320096474271168 CanvasRenderer: @@ -3755,10 +3755,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 416, y: -40} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2448420410505003609 CanvasRenderer: @@ -3875,10 +3875,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -249.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3053252216806101323 CanvasRenderer: @@ -3995,10 +3995,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -240} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5544138973351250216 CanvasRenderer: @@ -4251,10 +4251,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -152.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1575424651669620127 CanvasRenderer: @@ -4368,9 +4368,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 9128617693675511206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275.5, y: -655.58887} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 551, y: 7.1924} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2784884927307494791 @@ -4406,10 +4406,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -340} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7633877085109966583 CanvasRenderer: @@ -4661,9 +4661,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5322092470266254149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 37.5748, y: -45.8533} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75.1496, y: 91.7066} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2646092870800509053 @@ -4737,10 +4737,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -340} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4194804934609496390 CanvasRenderer: @@ -4857,10 +4857,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 416, y: -340} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3021272081848590921 CanvasRenderer: @@ -5066,8 +5066,8 @@ RectTransform: - {fileID: 428052944308552090} m_Father: {fileID: 4137397199301223842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 291.7535, y: 84.7022} m_Pivot: {x: 0, y: 1} @@ -5168,10 +5168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -249.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &190980205658531081 CanvasRenderer: @@ -5288,10 +5288,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -440} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5879911005273032791 CanvasRenderer: @@ -5408,10 +5408,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -440} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1534986817802727573 CanvasRenderer: @@ -5877,8 +5877,8 @@ RectTransform: - {fileID: 7214549036987193986} m_Father: {fileID: 9128617693675511206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 551, y: 69.1626} m_Pivot: {x: 0, y: 1} @@ -5941,10 +5941,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -540.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3991271759523329904 CanvasRenderer: @@ -6061,10 +6061,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -140} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1237639319172851338 CanvasRenderer: @@ -6182,9 +6182,9 @@ RectTransform: - {fileID: 6732304273198941900} m_Father: {fileID: 3289674559629147232} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 685.29913, y: 1.6450195} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 105.3151, y: 589.65} m_Pivot: {x: 1, y: 1} --- !u!114 &1522287784110960244 @@ -6246,10 +6246,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 416, y: -240} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5754514685750822431 CanvasRenderer: @@ -6579,9 +6579,9 @@ RectTransform: - {fileID: 7808448733240891499} m_Father: {fileID: 4137397199301223842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 447.99, y: -729.5422} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 895.98, y: 116.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &190637593687221269 @@ -6655,10 +6655,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -55.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3835074441426313191 CanvasRenderer: @@ -6896,10 +6896,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -443.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &439324892206865391 CanvasRenderer: @@ -7016,10 +7016,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 416, y: -440} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1231486592347248013 CanvasRenderer: @@ -7135,9 +7135,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5322092470266254149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 265.2046, y: -44.196} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 81.3263, y: 88.392} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2240998300055222533 @@ -7211,10 +7211,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -440} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4371092486067208881 CanvasRenderer: @@ -7406,10 +7406,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -540.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4628746204133985503 CanvasRenderer: @@ -7526,10 +7526,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -152.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1221014430903753338 CanvasRenderer: @@ -7646,10 +7646,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -443.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &886854967711375175 CanvasRenderer: @@ -7766,9 +7766,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4359352035478671586} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 463.25, y: -36.30285} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 185.3, y: 72.6057} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6248269220837765992 @@ -8380,9 +8380,9 @@ RectTransform: - {fileID: 5275130098495308601} m_Father: {fileID: 3289674559629147232} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 579.984, y: 1.6450195} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 361.6641, y: 589.65} m_Pivot: {x: 1, y: 1} --- !u!222 &5765354275366674162 @@ -8463,9 +8463,9 @@ RectTransform: - {fileID: 4473285131375918304} m_Father: {fileID: 3289674559629147232} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.00088500977, y: -293.18} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 218.319, y: 589.65} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6317463879725083737 @@ -8525,10 +8525,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -249.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8797342463982756794 CanvasRenderer: @@ -8751,10 +8751,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -55.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1201854048218098797 CanvasRenderer: @@ -8873,9 +8873,9 @@ RectTransform: - {fileID: 7385244939837755099} m_Father: {fileID: 4137397199301223842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -377.8822} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 895.98, y: 586.36} m_Pivot: {x: 0, y: 0.5} --- !u!114 &7940204632648220423 @@ -8916,14 +8916,14 @@ GameObject: - component: {fileID: 6612065338353497036} - component: {fileID: 8351850713118243030} - component: {fileID: 6001081573770107384} - - component: {fileID: 3888028119453218903} + - component: {fileID: 2043904448860146935} m_Layer: 5 m_Name: InventoryUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5834405183358786743 RectTransform: m_ObjectHideFlags: 0 @@ -9094,7 +9094,7 @@ MonoBehaviour: dropButton: {fileID: 540159372834342487} autoRefresh: 1 refreshInterval: 1 ---- !u!114 &3888028119453218903 +--- !u!114 &2043904448860146935 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9103,45 +9103,9 @@ MonoBehaviour: m_GameObject: {fileID: 5910006447059157136} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12345678901234567890123456789012, type: 3} + m_Script: {fileID: 11500000, guid: 24000eb1448ca674888f256f5508cadd, type: 3} m_Name: m_EditorClassIdentifier: - inventoryPackButtons: [] - equipmentPackButtons: [] - fashionPackButtons: [] - detailPanelRoot: {fileID: 0} - hideDetailOnStart: 1 - nameText: - legacy: {fileID: 0} - tmp: {fileID: 0} - templateIdText: - legacy: {fileID: 0} - tmp: {fileID: 0} - countText: - legacy: {fileID: 0} - tmp: {fileID: 0} - slotText: - legacy: {fileID: 0} - tmp: {fileID: 0} - packageText: - legacy: {fileID: 0} - tmp: {fileID: 0} - stateText: - legacy: {fileID: 0} - tmp: {fileID: 0} - expireText: - legacy: {fileID: 0} - tmp: {fileID: 0} - crcText: - legacy: {fileID: 0} - tmp: {fileID: 0} - contentLenText: - legacy: {fileID: 0} - tmp: {fileID: 0} - equipButton: {fileID: 0} - dropButton: {fileID: 0} - autoRefresh: 1 - refreshInterval: 1 --- !u!1 &5959049729314796227 GameObject: m_ObjectHideFlags: 0 @@ -9175,10 +9139,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -40} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5175444754395941254 CanvasRenderer: @@ -9295,10 +9259,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -249.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5622820993285289849 CanvasRenderer: @@ -9415,10 +9379,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -240} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6118420868098127345 CanvasRenderer: @@ -9535,10 +9499,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -346.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3199567078519673564 CanvasRenderer: @@ -9657,9 +9621,9 @@ RectTransform: - {fileID: 2881893989559991082} m_Father: {fileID: 9128617693675511206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275.465, y: -727.07745} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 550.93, y: 109.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6623773685852797451 @@ -9721,10 +9685,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -440} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8652011124182778102 CanvasRenderer: @@ -9841,10 +9805,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -140} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9123126539644973310 CanvasRenderer: @@ -9961,10 +9925,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -540} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5102435505795885177 CanvasRenderer: @@ -10080,9 +10044,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3250574652249393354} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52.65755, y: -345.15002} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 87, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4170514217395282725 @@ -10156,10 +10120,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -40} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &60662140527981697 CanvasRenderer: @@ -10396,9 +10360,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6394577350856306769} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 171.6091, y: -42.351} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 181.8504, y: 84.702} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5078733904066749844 @@ -10533,10 +10497,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7166820878650541780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 151.67, y: -59.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4452551064742165538 CanvasRenderer: @@ -10653,10 +10617,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -152.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3801095843970159967 CanvasRenderer: @@ -10770,9 +10734,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2881893989559991082} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 103.97, y: -8.3571} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 207.94, y: 16.7142} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6767820325414993679 @@ -10808,9 +10772,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4359352035478671586} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 277.95, y: -36.30285} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 185.3, y: 72.6057} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8787094950878048123 @@ -10928,10 +10892,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -240} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8820673898014700303 CanvasRenderer: @@ -11123,10 +11087,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -140} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1390963591436734300 CanvasRenderer: @@ -11308,10 +11272,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -340} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8509230124804756360 CanvasRenderer: @@ -11428,10 +11392,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -55.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5042626134686580672 CanvasRenderer: @@ -11547,9 +11511,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5322092470266254149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 149.84552, y: -46.4058} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75.1496, y: 92.8116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7963679714237608113 @@ -11633,9 +11597,9 @@ RectTransform: - {fileID: 5684558325445490201} m_Father: {fileID: 3289674559629147232} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 895.9791, y: 1.6450195} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 210.68, y: 589.65} m_Pivot: {x: 1, y: 1} --- !u!114 &7141971932172906013 @@ -11695,10 +11659,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7385244939837755099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -540.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1553234790883333738 CanvasRenderer: @@ -11815,9 +11779,9 @@ RectTransform: - {fileID: 9059265843531044829} m_Father: {fileID: 5322092470266254149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 446.95886, y: -42.922} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 207.94, y: 85.844} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3264558550496086104 @@ -11879,10 +11843,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -540} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8517783182093145413 CanvasRenderer: @@ -11999,10 +11963,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -540} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7479952664965110542 CanvasRenderer: @@ -12119,10 +12083,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -443.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3113591097916654337 CanvasRenderer: @@ -12307,10 +12271,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155.5, y: -346.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1676878558592945175 CanvasRenderer: @@ -12427,10 +12391,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -140} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6493950412203895480 CanvasRenderer: @@ -12544,9 +12508,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 9128617693675511206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275.5, y: -668.78125} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 551, y: 7.1924} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8589115324229298066 @@ -12718,10 +12682,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -40} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7990867294520296049 CanvasRenderer: @@ -12874,9 +12838,9 @@ RectTransform: - {fileID: 7493893175377255586} m_Father: {fileID: 9128617693675511206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275.465, y: -360.57764} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 550.93, y: 582.8301} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7404083144027875491 @@ -12974,10 +12938,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2570172941352584601} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55.5, y: -346.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7854867857203210993 CanvasRenderer: @@ -13094,10 +13058,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8745528644688140194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -340} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7539254848596933681 CanvasRenderer: @@ -13214,10 +13178,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7166820878650541780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 260.84, y: -59.5} - m_SizeDelta: {x: 85, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5155025384962724770 CanvasRenderer: diff --git a/Assets/Scenes/NPCRender.unity b/Assets/Scenes/NPCRender.unity index 6ba66f0769..71f72fa885 100644 --- a/Assets/Scenes/NPCRender.unity +++ b/Assets/Scenes/NPCRender.unity @@ -51859,6 +51859,7 @@ GameObject: - component: {fileID: 683026977} - component: {fileID: 683026976} - component: {fileID: 683026975} + - component: {fileID: 683026978} m_Layer: 5 m_Name: IvtrBtn m_TagString: Untagged @@ -51984,6 +51985,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 683026973} m_CullTransparentMesh: 1 +--- !u!114 &683026978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683026973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 24000eb1448ca674888f256f5508cadd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!28 &683052458 Texture2D: m_ObjectHideFlags: 0 @@ -59320,54 +59333,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5834405183358786743, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} m_PrefabInstance: {fileID: 214042596392055003} m_PrefabAsset: {fileID: 0} ---- !u!114 &752532604 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 752532602} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12345678901234567890123456789012, type: 3} - m_Name: - m_EditorClassIdentifier: - inventoryPackButtons: [] - equipmentPackButtons: [] - fashionPackButtons: [] - detailPanelRoot: {fileID: 0} - hideDetailOnStart: 1 - nameText: - legacy: {fileID: 0} - tmp: {fileID: 0} - templateIdText: - legacy: {fileID: 0} - tmp: {fileID: 0} - countText: - legacy: {fileID: 0} - tmp: {fileID: 0} - slotText: - legacy: {fileID: 0} - tmp: {fileID: 0} - packageText: - legacy: {fileID: 0} - tmp: {fileID: 0} - stateText: - legacy: {fileID: 0} - tmp: {fileID: 0} - expireText: - legacy: {fileID: 0} - tmp: {fileID: 0} - crcText: - legacy: {fileID: 0} - tmp: {fileID: 0} - contentLenText: - legacy: {fileID: 0} - tmp: {fileID: 0} - equipButton: {fileID: 0} - dropButton: {fileID: 0} - autoRefresh: 1 - refreshInterval: 1 --- !u!1 &755821556 GameObject: m_ObjectHideFlags: 0 @@ -165671,13 +165636,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -340 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2043904448860146935, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5910006447059157136, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} - insertIndex: -1 - addedObject: {fileID: 752532604} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index 90f39a6d4b..c6c63b92e0 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -404,20 +404,23 @@ public class CECHostPlayer : CECPlayer { case CommandID.PICKUP_ITEM: { - // Parse the pickup item data from the server response - if (data != null && data.Length >= 16) + int tid = BitConverter.ToInt32(data, 0); + int expire_date = BitConverter.ToInt32(data, 4); + uint iAmount = BitConverter.ToUInt32(data, 8); + uint iSlotAmount = BitConverter.ToUInt32(data, 12); + byte byPackage = data[16]; + byte bySlot = data[17]; + + Debug.Log($"[Inventory] PICKUP_ITEM: tid={tid}, expire_date={expire_date}, iAmount={iAmount}, iSlotAmount={iSlotAmount}, byPackage={byPackage}, bySlot={bySlot}"); + + // Notify pickupItem script about successful pickup + pickupItem pickupScript = pickupItem.Instance; + if (pickupScript != null) { - int tid = BitConverter.ToInt32(data, 0); - int expire_date = BitConverter.ToInt32(data, 4); - uint iAmount = BitConverter.ToUInt32(data, 8); - uint iSlotAmount = BitConverter.ToUInt32(data, 12); - byte byPackage = data[16]; - byte bySlot = data[17]; - Debug.Log($"[Inventory] PICKUP_ITEM: tid={tid}, expire_date={expire_date}, iAmount={iAmount}, iSlotAmount={iSlotAmount}, byPackage={byPackage}, bySlot={bySlot}"); // Notify pickupItem script about successful pickup - pickupItem pickupScript = UnityEngine.Object.FindFirstObjectByType(); + pickupScript = UnityEngine.Object.FindFirstObjectByType(); if (pickupScript != null) { pickupScript.OnPickupSuccess(tid); diff --git a/Assets/StreamingAssets/gshop.data b/Assets/StreamingAssets/gshop.data new file mode 100644 index 0000000000..60cdbd69ae Binary files /dev/null and b/Assets/StreamingAssets/gshop.data differ diff --git a/Assets/StreamingAssets/gshop.data.meta b/Assets/StreamingAssets/gshop.data.meta new file mode 100644 index 0000000000..447ce8de78 --- /dev/null +++ b/Assets/StreamingAssets/gshop.data.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c41129e7ce0172646bfb09d0ddb30e97 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/gshop1.data b/Assets/StreamingAssets/gshop1.data new file mode 100644 index 0000000000..3e74172f6d Binary files /dev/null and b/Assets/StreamingAssets/gshop1.data differ diff --git a/Assets/StreamingAssets/gshop1.data.meta b/Assets/StreamingAssets/gshop1.data.meta new file mode 100644 index 0000000000..97f859f13e --- /dev/null +++ b/Assets/StreamingAssets/gshop1.data.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3225fad25b02b6d47ae09df59f44bbce +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: