duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop

Browse Source
This commit is contained in:
Le Duc Anh
2026-03-17 17:39:46 +07:00
parent 2c5b9a9104 13c48e7f31
commit 90eb4ff4ce
5 changed files with 389 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs
+125 -156
View File
@@ -1,4 +1,4 @@
using BrewMonster.Network;
using BrewMonster.Network;
using BrewMonster.Scripts.Managers;
using BrewMonster.UI;
using PerfectWorld.Scripts.Managers;
@@ -37,12 +37,13 @@ namespace BrewMonster
[Header("Buttons and Money")]
[SerializeField]
private TextMeshProUGUI m_TxtMoney;
[SerializeField] private Button m_useItem;
[SerializeField] private Button m_BtnMergeOrReset;
[SerializeField] private Button m_BtnCancel;
[SerializeField] private Button m_BtnClose;
[SerializeField] private Sprite khung_item;
[SerializeField] private Transform itemInventoryRoot;
[SerializeField] private GameObject itemInventoryRoot;
private EC_IvtrItem m_SelectedEquip;
private EC_IvtrItem m_SelectedMaterial;
@@ -58,31 +59,14 @@ namespace BrewMonster
public override void Awake()
{
base.Awake();
RegisterDrop(m_SlotFirstParent, OnDropEquip);
RegisterClick(m_SlotFirstParent, OnClickEquipSlot);
if (m_Mode == InstallMode.Enchase && m_SlotSecondParent != null)
{
RegisterDrop(m_SlotSecondParent, OnDropMaterial);
RegisterClick(m_SlotSecondParent, OnClickMaterialSlot);
}
}
public override void Update()
{
#if UNITY_EDITOR || UNITY_STANDALONE
if (Input.GetMouseButtonDown(0))
{
CheckHidePanel(Input.mousePosition);
}
#else
if (Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Began)
{
CheckHidePanel(Input.GetTouch(0).position);
}
#endif
}
public override void OnEnable()
{
base.OnEnable();
@@ -91,6 +75,7 @@ namespace BrewMonster
m_BtnMergeOrReset.onClick.AddListener(OnClickedMergeOrReset);
m_BtnCancel.onClick.AddListener(OnCommandCancel);
m_BtnClose.onClick.AddListener(OnCommandCancel);
m_useItem.onClick.AddListener(OnUseItemClicked);
m_install_price = -1;
if (m_SlotSecondParent != null)
m_SlotSecondParent.gameObject.SetActive(m_Mode == InstallMode.Enchase);
@@ -104,6 +89,7 @@ namespace BrewMonster
m_BtnMergeOrReset.onClick.RemoveListener(OnClickedMergeOrReset);
m_BtnCancel.onClick.RemoveListener(OnCommandCancel);
m_BtnClose.onClick.RemoveListener(OnCommandCancel);
m_useItem.onClick.RemoveListener(OnUseItemClicked);
}
private void RestoreInventoryColors()
@@ -147,23 +133,6 @@ namespace BrewMonster
return list[slot];
}
private void RegisterDrop(Transform target, Action<PointerEventData> callback)
{
var trigger = target.GetComponent<EventTrigger>();
if (trigger == null)
trigger = target.gameObject.AddComponent<EventTrigger>();
trigger.triggers.Clear();
var entry = new EventTrigger.Entry
{
eventID = EventTriggerType.Drop
};
entry.callback.AddListener((data) => { callback((PointerEventData)data); });
trigger.triggers.Add(entry);
}
private void RegisterClick(Transform target, Action<PointerEventData> callback)
{
if (target == null) return;
@@ -199,117 +168,6 @@ namespace BrewMonster
}
}
private EC_IvtrItem GetItemFromDrag(PointerEventData eventData)
{
if (eventData.pointerDrag == null)
return null;
var btn = eventData.pointerDrag.GetComponent<Button>();
if (btn == null)
return null;
// Slot index
int slotIndex = btn.transform.GetSiblingIndex();
// Inventory package = 0
var host = CECGameRun.Instance?.GetHostPlayer();
if (host == null)
return null;
var inv = host.GetInventory(0);
if (inv == null)
return null;
return inv.GetItem(slotIndex, false);
}
private void OnDropEquip(PointerEventData eventData)
{
if (eventData.pointerDrag == null)
return;
var btn = eventData.pointerDrag.GetComponent<Button>();
if (btn == null)
return;
int slotIndex = btn.transform.GetSiblingIndex();
var item = GetItemFromDrag(eventData);
if (item == null)
return;
if(!item.IsEquipment())
return;
EC_IvtrItem detailedItem = EC_IvtrItem.CreateItem(item.m_tid, item.m_expire_date, item.m_iCount);
if (item.Content != null && item.Content.Length > 0)
detailedItem.SetItemInfo(item.Content, item.Content.Length);
else
detailedItem.GetDetailDataFromLocal();
if (m_FirstInvSlot >= 0)
{
var previosBtn = FindInventoryButtonBySlot(m_FirstInvSlot);
SetInventorySlotGray(previosBtn, false);
}
m_SelectedEquip?.Freeze(false);
m_SelectedEquip = detailedItem;
m_FirstInvSlot = slotIndex;
m_TxtFirstName.text = detailedItem.GetName();
SetSlotIcon(m_SlotFirstParent, detailedItem);
SetInventorySlotGray(btn, true);
detailedItem.Freeze(true);
UpdateResourceInfo();
}
private void OnDropMaterial(PointerEventData eventData)
{
if (eventData.pointerDrag == null)
return;
var btn = eventData.pointerDrag.GetComponent<Button>();
if (btn == null)
return;
int slotIndex = btn.transform.GetSiblingIndex();
var item = GetItemFromDrag(eventData);
if (item == null)
return;
if (item.GetClassID() != (int)EC_IvtrEquip.EQUIP_CLASS_ID.ICID_STONE)
return;
EC_IvtrItem detailedItem = EC_IvtrItem.CreateItem(item.m_tid, item.m_expire_date, item.m_iCount);
if (item.Content != null && item.Content.Length > 0)
detailedItem.SetItemInfo(item.Content, item.Content.Length);
else
detailedItem.GetDetailDataFromLocal();
if (m_SecondInvSlot >= 0)
{
var previosBtn = FindInventoryButtonBySlot(m_SecondInvSlot);
SetInventorySlotGray(previosBtn, false);
}
m_SelectedMaterial?.Freeze(false);
m_SelectedMaterial = detailedItem;
m_SelectedMaterial?.Freeze(true);
m_SecondInvSlot = slotIndex;
m_TxtSecondName.text = detailedItem.GetName();
SetSlotIcon(m_SlotSecondParent, detailedItem);
SetInventorySlotGray(btn, true);
UpdateResourceInfo();
}
private void CalculateUninstallPrice(EC_IvtrItem equipment)
{
if (equipment == null || !equipment.IsEquipment())
@@ -507,7 +365,7 @@ namespace BrewMonster
}
message = GetGameUIMan().GetStringFromTable(229);
CECUIManager.Instance.ShowMessageBoxYesAndNo("", message, this,
CECUIManager.Instance.ShowMessageBoxYesAndNo("", message, this,
() =>
{
UnityGameSession.c2s_CmdNPCSevClearEmbeddedChip((ushort)m_FirstInvSlot, pIvtrA.GetTemplateID());
@@ -554,16 +412,127 @@ namespace BrewMonster
CloseDialogue();
}
private void CheckHidePanel(Vector2 screenPos)
private void OnUseItemClicked()
{
if (!RectTransformUtility.RectangleContainsScreenPoint(
itemInventoryRoot as RectTransform, screenPos,
Camera.main))
itemInventoryRoot.SetActive(false);
if (!TryGetSelectedInventoryItem(out var selectedItem, out var selectedSlot))
return;
if (m_Mode == InstallMode.Disenchase)
{
if (itemInventoryRoot != null)
itemInventoryRoot.gameObject.SetActive(false);
if (!selectedItem.IsEquipment())
{
var message = GetGameUIMan().GetStringFromTable(223);
CECUIManager.Instance.ShowMessageBoxGeneral("", message, this);
return;
}
AssignEquipItem(selectedItem, selectedSlot);
return;
}
if (m_SelectedEquip == null)
{
if (!selectedItem.IsEquipment())
{
var msg = GetGameUIMan().GetStringFromTable(223);
CECUIManager.Instance.ShowMessageBoxGeneral("", msg, this);
return;
}
AssignEquipItem(selectedItem, selectedSlot);
return;
}
if (selectedItem.IsEquipment())
{
AssignEquipItem(selectedItem, selectedSlot);
return;
}
if(!selectedItem.IsEmbeddable() ||
selectedItem.GetClassID() != (int)EC_IvtrEquip.EQUIP_CLASS_ID.ICID_STONE)
{
var msg = GetGameUIMan().GetStringFromTable(225);
CECUIManager.Instance.ShowMessageBoxGeneral("", msg, this);
return;
}
AssginMaterialItem(selectedItem, selectedSlot);
}
private bool TryGetSelectedInventoryItem(out EC_IvtrItem item, out int slot)
{
item = null;
slot = -1;
var inventoryUI = FindFirstObjectByType<EC_InventoryUI>();
if(inventoryUI == null)
return false;
var type = typeof(EC_InventoryUI);
var packageField = type.GetField("currentSelectedPackage", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
var slotField = type.GetField("currentSelectedSlot", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
var itemField = type.GetField("currentSelectedItem", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
if (packageField == null ||slotField == null || itemField == null)
{
return false;
}
var selectedPackage = (byte)packageField.GetValue(inventoryUI);
if(selectedPackage != 0)
return false;
slot = (int)slotField.GetValue(inventoryUI);
item = itemField.GetValue(inventoryUI) as EC_IvtrItem;
return item != null && slot >= 0;
}
private void AssignEquipItem(EC_IvtrItem item, int slot)
{
if(m_FirstInvSlot >= 0 && m_FirstInvSlot != slot)
{
ReturnItemToInventory(m_FirstInvSlot);
}
m_SelectedEquip?.Freeze(false);
m_SelectedEquip = item;
m_SelectedEquip.Freeze(true);
m_FirstInvSlot = slot;
m_TxtFirstName.text = EC_IvtrItemUtils.Instance.ResolveItemName(item.m_tid);
SetSlotIcon(m_SlotFirstParent, item);
SetInventorySlotGray(FindInventoryButtonBySlot(slot), true);
if(m_Mode == InstallMode.Disenchase)
{
CalculateUninstallPrice(item);
}
else
{
UpdateResourceInfo();
}
}
private void AssginMaterialItem(EC_IvtrItem item, int slot)
{
if(m_SecondInvSlot >= 0 && m_SecondInvSlot != slot)
{
ReturnItemToInventory(m_SecondInvSlot);
}
m_SelectedMaterial?.Freeze(false);
m_SelectedMaterial = item;
m_SelectedMaterial.Freeze(true);
m_SecondInvSlot = slot;
m_TxtSecondName.text = EC_IvtrItemUtils.Instance.ResolveItemName(item.m_tid);
SetSlotIcon(m_SlotSecondParent, item);
SetInventorySlotGray(FindInventoryButtonBySlot(slot), true);
if (item is EC_IvtrStone stone)
{
var essence = stone.GetDBEssence();
m_install_price = essence.install_price;
}
UpdateResourceInfo();
}
private void UpdateResourceInfo()
@@ -617,4 +586,4 @@ namespace BrewMonster
}
}
}
}
}
Assets/Prefabs/UI/DlgInstall.prefab
+124 -16
View File
@@ -10122,11 +10122,12 @@ MonoBehaviour:
m_SlotSecondParent: {fileID: 7151360590639773519}
m_TxtSecondName: {fileID: 4492084240745408081}
m_TxtMoney: {fileID: 6140428454487430115}
m_useItem: {fileID: 29649554038592406}
m_BtnMergeOrReset: {fileID: 8208092408021918524}
m_BtnCancel: {fileID: 4503836757578509720}
m_BtnClose: {fileID: 5942200196902544367}
khung_item: {fileID: 21300000, guid: a5366f3bce011c046902e39b6bd3a077, type: 3}
itemInventoryRoot: {fileID: 6829484673054423729}
itemInventoryRoot: {fileID: 3361511320564075180}
--- !u!1 &5641506892578507279
GameObject:
m_ObjectHideFlags: 0
@@ -11541,12 +11542,12 @@ MonoBehaviour:
- {fileID: 682304874874096685}
equipmentPackButtons: []
fashionPackButtons: []
detailPanelRoot: {fileID: 4012993487235845803}
detailPanelRoot: {fileID: 895914416731758390}
detailPanelOffset: {x: 20, y: 0}
hideDetailOnStart: 1
descriptionText:
legacy: {fileID: 0}
tmp: {fileID: 7977462308482374098}
tmp: {fileID: 6154813818007210063}
equipButton: {fileID: 0}
dropButton: {fileID: 0}
autoRefresh: 1
@@ -15326,7 +15327,7 @@ RectTransform:
- {fileID: 368043242273701515}
- {fileID: 9177880079034759179}
- {fileID: 7246818111234384827}
- {fileID: 6829484673054423729}
- {fileID: 7284815503472110380}
m_Father: {fileID: 2126663214709926210}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -15494,7 +15495,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1001 &5454539435686182200
--- !u!1001 &8101275948331805861
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -15502,6 +15503,42 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 7802877985602690998}
m_Modifications:
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_text
value: "D\xF9ng"
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_fontSize
value: 48.2
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_fontSizeBase
value: 48.2
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_enableAutoSizing
value: 0
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_VerticalAlignment
value: 256
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -15532,7 +15569,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 948.02
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_LocalPosition.x
@@ -15582,37 +15619,103 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.x
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 67.9
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 532
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -37
objectReference: {fileID: 0}
- target: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_Name
value: item_info
objectReference: {fileID: 0}
- target: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -928.02
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 928.02
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -464.01
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 5721094068644211543, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
- {fileID: 2412057975732520665, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
--- !u!114 &4012993487235845803 stripped
--- !u!114 &29649554038592406 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8936108025019184019, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 5454539435686182200}
m_CorrespondingSourceObject: {fileID: 8071811253980610355, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 8101275948331805861}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &895914416731758390 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8936108025019184019, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 8101275948331805861}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3361511320564075180}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc26b8fa93aea49b4abb8fe5455e51fe, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &6829484673054423729 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 5454539435686182200}
--- !u!1 &3361511320564075180 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 8101275948331805861}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7977462308482374098 stripped
--- !u!114 &6154813818007210063 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2668322321768899818, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 5454539435686182200}
m_PrefabInstance: {fileID: 8101275948331805861}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
@@ -15620,3 +15723,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &7284815503472110380 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 8101275948331805861}
m_PrefabAsset: {fileID: 0}
Assets/Prefabs/UI/DlgUninstall.prefab
+125 -17
View File
@@ -5008,7 +5008,7 @@ RectTransform:
- {fileID: 1855914562645533114}
- {fileID: 266114259042437322}
- {fileID: 1338776982451432036}
- {fileID: 1987977497822864791}
- {fileID: 4288721509633095201}
m_Father: {fileID: 4831774033530242134}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -12381,12 +12381,12 @@ MonoBehaviour:
- {fileID: 5792136090770346751}
equipmentPackButtons: []
fashionPackButtons: []
detailPanelRoot: {fileID: 8277765033433731469}
detailPanelRoot: {fileID: 5977025530225345083}
detailPanelOffset: {x: 20, y: 0}
hideDetailOnStart: 1
descriptionText:
legacy: {fileID: 0}
tmp: {fileID: 3162688658909775604}
tmp: {fileID: 861892775934367042}
equipButton: {fileID: 0}
dropButton: {fileID: 0}
autoRefresh: 1
@@ -14129,11 +14129,12 @@ MonoBehaviour:
m_SlotSecondParent: {fileID: 0}
m_TxtSecondName: {fileID: 0}
m_TxtMoney: {fileID: 4189875348703427985}
m_useItem: {fileID: 6842395531987078811}
m_BtnMergeOrReset: {fileID: 4189663341364179351}
m_BtnCancel: {fileID: 5948134181014720611}
m_BtnClose: {fileID: 7824290302850289289}
khung_item: {fileID: 21300000, guid: a5366f3bce011c046902e39b6bd3a077, type: 3}
itemInventoryRoot: {fileID: 1987977497822864791}
itemInventoryRoot: {fileID: 8086838596064663457}
--- !u!1 &8698343819671822384
GameObject:
m_ObjectHideFlags: 0
@@ -15201,7 +15202,7 @@ MonoBehaviour:
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1001 &1072957973245895198
--- !u!1001 &3382704604835541416
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -15209,6 +15210,42 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 4506920216670819167}
m_Modifications:
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_text
value: "D\xF9ng"
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_fontSize
value: 48.2
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_fontSizeBase
value: 48.2
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_enableAutoSizing
value: 0
objectReference: {fileID: 0}
- target: {fileID: 777847736648841921, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_VerticalAlignment
value: 256
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -15239,7 +15276,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 948.02
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_LocalPosition.x
@@ -15289,26 +15326,76 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.x
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 67.9
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 532
objectReference: {fileID: 0}
- target: {fileID: 1900527214026617767, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -37
objectReference: {fileID: 0}
- target: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_Name
value: item_info
objectReference: {fileID: 0}
- target: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -928.02
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 928.02
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -464.01
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 5721094068644211543, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
- {fileID: 2412057975732520665, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
--- !u!224 &1987977497822864791 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 1072957973245895198}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3162688658909775604 stripped
--- !u!114 &861892775934367042 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2668322321768899818, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 1072957973245895198}
m_PrefabInstance: {fileID: 3382704604835541416}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
@@ -15316,14 +15403,35 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8277765033433731469 stripped
--- !u!224 &4288721509633095201 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 3382704604835541416}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5977025530225345083 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8936108025019184019, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 1072957973245895198}
m_PrefabInstance: {fileID: 3382704604835541416}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_GameObject: {fileID: 8086838596064663457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc26b8fa93aea49b4abb8fe5455e51fe, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6842395531987078811 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8071811253980610355, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 3382704604835541416}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8086838596064663457 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 3382704604835541416}
m_PrefabAsset: {fileID: 0}
Assets/Scripts/CECHostPlayer.cs
+1
View File
@@ -574,6 +574,7 @@ namespace BrewMonster
case EC_MsgDef.MSG_HST_SETPLAYERLIMIT: OnMsgHstSetPlayerLimit(Msg); break;
case EC_MsgDef.MSG_PM_PLAYERMOUNT: OnMsgPlayerMount(Msg); break;
case EC_MsgDef.MSG_HST_EMBEDITEM: OnMsgHstEmbedItem(Msg); break;
case EC_MsgDef.MSG_HST_CLEARTESSERA: OnMsgHstClearTessera(Msg); break;
case EC_MsgDef.MSG_HST_JOINTEAM: OnMsgHstJoinTeam(Msg); break;
case EC_MsgDef.MSG_HST_LEAVETEAM: OnMsgHstLeaveTeam(Msg); break;
case EC_MsgDef.MSG_HST_NEWTEAMMEM: OnMsgHstNewTeamMem(Msg); break;
Assets/Scripts/CECUIManager.cs
+14 -14
View File
@@ -502,20 +502,20 @@ public class CECUIManager : MonoSingleton<CECUIManager>
AddChatMessage(GetStringFromTable(11168), GP_CHAT_MISC);*/
}
}
else if (pDlg is DlgInstall dlgInstall && dlgInstall.GetInstallMode == DlgInstall.InstallMode.Disenchase &&
DialogBoxCommandIDs.IDOK == iRetVal)
{
UnityGameSession.c2s_CmdNPCSevClearEmbeddedChip(dlgInstall.FirstSlotIndex,
dlgInstall.SelectedEquip.GetTemplateID());
//else if (pDlg is DlgInstall dlgInstall && dlgInstall.GetInstallMode == DlgInstall.InstallMode.Disenchase &&
// DialogBoxCommandIDs.IDOK == iRetVal)
//{
// UnityGameSession.c2s_CmdNPCSevClearEmbeddedChip(dlgInstall.FirstSlotIndex,
// dlgInstall.SelectedEquip.GetTemplateID());
// UnityGameSession.c2s_CmdGetAllData(true, true, false);
// dlgInstall.Show(false);
// pHost.EndNPCService();
// // m_pCurNPCEssence = NULL;
// // m_pDlgInventory->Show(false);
// pHost.GetPack((int)InventoryType.IVTRTYPE_PACK).UnfreezeAllItems();
dlgInstall.Show(false);
pHost.EndNPCService();
// m_pCurNPCEssence = NULL;
// m_pDlgInventory->Show(false);
pHost.GetPack((int)InventoryType.IVTRTYPE_PACK).UnfreezeAllItems();
ShowMessageBoxGeneral("",pDlg.GetStringFromTable(228), null);
}
// ShowMessageBoxGeneral("", pDlg.GetStringFromTable(228), null);
//}
}
private bool OnNewMessageBox(int iRetVal)
@@ -795,4 +795,4 @@ public class CECUIManager : MonoSingleton<CECUIManager>
str = new string(chars);
}
}
}