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

Merge pull request 'feature/friend_ui' (#272) from feature/friend_ui into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/272
This commit is contained in:
hainh
2026-03-24 09:15:09 +00:00
parent 7e53b4ff7e 11600180d4
commit 2012330242
12 changed files with 487 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+5
View File
@@ -215,6 +215,9 @@ namespace BrewMonster.Scripts.Managers
/// </summary>
public void UpdateMoney(ulong amount, ulong maxAmount)
{
s_pendingMoneyAmount = amount;
s_pendingMoneyMaxAmount = maxAmount;
s_hasPendingMoney = true;
string text = amount.ToString();
if (moneyTextsLegacy != null)
{
@@ -241,6 +244,8 @@ namespace BrewMonster.Scripts.Managers
/// </summary>
public void UpdateCash(int amount)
{
s_pendingCashAmount = amount;
s_hasPendingCash = true;
string text = amount.ToString();
if (cashTextsLegacy != null)
{
Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
+6
View File
@@ -1594,6 +1594,12 @@ namespace CSNetwork.GPDataType
public int amount;
}
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct cmd_spend_money
{
public ulong cost;
}
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct cmd_produce_start
{
Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
+3
View File
@@ -957,6 +957,9 @@ namespace CSNetwork
case CommandID.OWN_IVTR_DATA:
case CommandID.OWN_IVTR_DETAIL_DATA:
case CommandID.GET_OWN_MONEY:
//case CommandID.SPEND_MONEY:
// EC_ManMessage.PostMessage(EC_MsgDef.MSG_HST_SPENDMONEY, MANAGER_INDEX.MAN_PLAYER, 0, pDataBuf, pCmdHeader);
// break;
case CommandID.CHANGE_IVTR_SIZE:
EC_ManMessage.PostMessage(EC_MsgDef.MSG_HST_IVTRINFO, (int)MANAGER_INDEX.MAN_PLAYER, 0, pDataBuf,
pCmdHeader, iHostID);
Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetRec.cs
+13 -1
View File
@@ -205,6 +205,9 @@ namespace BrewMonster.UI
if (m_nSlot >= 0)
{
GetHostPlayer().RestorePet(m_nSlot);
LoadPetSlotFromCorral();
ClearPet();
UpdatePetSlotUI();
GetGameUIMan()?.EndNPCService();
Show(false);
//GetGameUIMan()->m_pDlgPetList->Show(false);
@@ -392,10 +395,10 @@ namespace BrewMonster.UI
if (m_pBtn_PetSlots[i] == null)
continue;
var buttonImage = m_pBtn_PetSlots[i].GetComponent<Image>();
var petData = m_petSlots[i];
if (petData != null)
{
var buttonImage = m_pBtn_PetSlots[i].GetComponent<Image>();
if (buttonImage != null)
{
DATA_TYPE dataType = DATA_TYPE.DT_INVALID;
@@ -440,6 +443,15 @@ namespace BrewMonster.UI
bool isSelectedPet = (m_nSlot == i && m_pCurrentPet != null);
m_pBtn_PetSlots[i].interactable = !isActivePet && !isSelectedPet;
}
else
{
if (buttonImage != null)
{
ClearSlotIcon(buttonImage);
buttonImage.color = Color.white;
}
m_pBtn_PetSlots[i].interactable = true;
}
}
}
Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
+13 -2
View File
@@ -1,4 +1,4 @@
using BrewMonster.Network;
using BrewMonster.Network;
using BrewMonster.Scripts.Managers;
using BrewMonster.Scripts.Task;
using BrewMonster.UI;
@@ -23,6 +23,7 @@ namespace BrewMonster
[SerializeField] private string tabButtonTextComponentName = "Text";
[Header("Produce Detail")]
[SerializeField] private ScrollRect m_scrollRect;
[SerializeField] private Transform itemContainer;
[SerializeField] private GameObject itemPb;
@@ -241,7 +242,12 @@ namespace BrewMonster
if(btn != null)
{
int capturedIndex = pageIndex;
btn.onClick.AddListener(() => OnTabSelected(capturedIndex));
btn.onClick.AddListener(() =>
{
OnTabSelected(capturedIndex);
ResetOnTop();
});
}
}
}
@@ -904,6 +910,11 @@ namespace BrewMonster
}
private void ResetOnTop()
{
m_scrollRect.verticalNormalizedPosition = 1f;
}
public void OnDestroy()
{
ClearContainer(tabBtnContainer);
Assets/PerfectWorld/UI/DlgProduce.prefab
+416 -20
View File
@@ -272,6 +272,142 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &70114320900013507
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 789401693037584548}
- component: {fileID: 174827458641637006}
- component: {fileID: 1706491284262151001}
m_Layer: 5
m_Name: value
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &789401693037584548
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 70114320900013507}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6881174879155244888}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -76.23927, y: -1.2526}
m_SizeDelta: {x: 133.1375, y: 46.509}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &174827458641637006
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 70114320900013507}
m_CullTransparentMesh: 1
--- !u!114 &1706491284262151001
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 70114320900013507}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 33
m_fontSizeBase: 33
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: -3.1838207, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &192599202523918635
GameObject:
m_ObjectHideFlags: 0
@@ -8750,7 +8886,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -9695,7 +9831,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 190.55}
m_SizeDelta: {x: 0, y: 414.7042}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5533501872213994117
MonoBehaviour:
@@ -12650,6 +12786,42 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5602599835815257179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2747539822277118411}
m_Layer: 5
m_Name: bottom
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2747539822277118411
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5602599835815257179}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6388306983607914181}
m_Father: {fileID: 6148732438360338751}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 551, y: 76.9929}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5609841959885064357
GameObject:
m_ObjectHideFlags: 0
@@ -13265,9 +13437,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c5653f9f523864f47a37bcfad6111bce, type: 3}
m_Name:
m_EditorClassIdentifier:
skillNameText: {fileID: 0}
imageProgress: {fileID: 0}
tabBtnContainer: {fileID: 8572018612644380183}
tabBtnPb: {fileID: 532136160345846687, guid: 548ae6ac061bc9648b093c9f9d203615, type: 3}
tabButtonTextComponentName: Text
m_scrollRect: {fileID: 6611684716447600188}
itemContainer: {fileID: 3338815937298185852}
itemPb: {fileID: 3478571236783653060, guid: b89cfffd83c228f4886273562ff4e111, type: 3}
quantityText:
@@ -13629,7 +13804,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -13661,7 +13836,7 @@ MonoBehaviour:
m_Content: {fileID: 3338815937298185852}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
@@ -13676,6 +13851,81 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5847795749707775693
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5040031872477380263}
- component: {fileID: 736853770351864709}
- component: {fileID: 7661421627214692747}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5040031872477380263
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5847795749707775693}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6881174879155244888}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 33.8445, y: -1.2525}
m_SizeDelta: {x: 52.5132, y: 46.5092}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &736853770351864709
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5847795749707775693}
m_CullTransparentMesh: 1
--- !u!114 &7661421627214692747
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5847795749707775693}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: acb875b203dad934ba6728afc54a0457, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5857206669955516811
GameObject:
m_ObjectHideFlags: 0
@@ -13737,7 +13987,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -14176,6 +14426,41 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5967721196410837174
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7014012699842272084}
m_Layer: 5
m_Name: padding
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7014012699842272084
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5967721196410837174}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6388306983607914181}
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_SizeDelta: {x: 207.94, y: 16.7142}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6073156465046363571
GameObject:
m_ObjectHideFlags: 0
@@ -15859,6 +16144,83 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6842285581628894140
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6881174879155244888}
- component: {fileID: 5629218913493257010}
- component: {fileID: 5492897892786552407}
m_Layer: 5
m_Name: khung_tien
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6881174879155244888
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6842285581628894140}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5040031872477380263}
- {fileID: 789401693037584548}
m_Father: {fileID: 6388306983607914181}
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: -46.853596}
m_SizeDelta: {x: 206.9879, y: 58.067}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5629218913493257010
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6842285581628894140}
m_CullTransparentMesh: 1
--- !u!114 &5492897892786552407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6842285581628894140}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 76f221d3f4723d84396a3a34a7c832e6, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 0.5
--- !u!1 &6846043642406901907
GameObject:
m_ObjectHideFlags: 0
@@ -16970,7 +17332,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 321.8199, y: -135.11911}
m_AnchoredPosition: {x: 321.8199, y: -111.99997}
m_SizeDelta: {x: -1331.3702, y: 51.2261}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7107669718148059426
@@ -17383,7 +17745,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -17603,7 +17965,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -18237,11 +18599,12 @@ RectTransform:
- {fileID: 4141445087230863076}
- {fileID: 1051688473320605609}
- {fileID: 9106679786015196161}
- {fileID: 2747539822277118411}
m_Father: {fileID: 1108604418086848939}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -370, y: -127}
m_AnchoredPosition: {x: -370, y: -87}
m_SizeDelta: {x: 551, y: 781.7728}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1545313863142283565
@@ -18282,6 +18645,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 12345678901234567890123456789012, type: 3}
m_Name:
m_EditorClassIdentifier:
skillNameText: {fileID: 0}
imageProgress: {fileID: 0}
inventoryPackButtons:
- {fileID: 8610406895042781376}
- {fileID: 1347616396337973875}
@@ -18324,25 +18689,19 @@ MonoBehaviour:
detailPanelRoot: {fileID: 1753167144210994885}
detailPanelOffset: {x: 20, y: 0}
hideDetailOnStart: 1
nameText:
legacy: {fileID: 0}
tmp: {fileID: 7304082661431364846}
descriptionText:
legacy: {fileID: 0}
tmp: {fileID: 4926468606842631984}
extendedDescText:
legacy: {fileID: 0}
tmp: {fileID: 0}
equipButton: {fileID: 0}
dropButton: {fileID: 0}
autoRefresh: 1
refreshInterval: 1
showEquipmentDetails: 1
moneyTextsLegacy: []
moneyTextsTMP: []
moneyTextsTMP:
- {fileID: 1706491284262151001}
cashTextsLegacy: []
cashTextsTMP: []
currentDragImage: {fileID: 0}
--- !u!1 &8531818128743034073
GameObject:
m_ObjectHideFlags: 0
@@ -18546,8 +18905,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 8572018612644380183}
m_Horizontal: 1
m_Vertical: 1
m_Horizontal: 0
m_Vertical: 0
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
@@ -19426,6 +19785,43 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8857320422253253108
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6388306983607914181}
m_Layer: 5
m_Name: tien
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6388306983607914181
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8857320422253253108}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7014012699842272084}
- {fileID: 6881174879155244888}
m_Father: {fileID: 2747539822277118411}
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: -22}
m_SizeDelta: {x: 207.94, y: 76.993}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8906529666242649700
GameObject:
m_ObjectHideFlags: 0
@@ -20028,7 +20424,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 543, y: -135.11911}
m_AnchoredPosition: {x: 543, y: -112}
m_SizeDelta: {x: -1578.0154, y: 51.2261}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &379168591246989621
Assets/PerfectWorld/UI/Pet/DlgPetHatch.prefab
-1
View File
@@ -2312,7 +2312,6 @@ MonoBehaviour:
- {fileID: 3143844115087084068}
cashTextsLegacy: []
cashTextsTMP: []
currentDragImage: {fileID: 0}
--- !u!1 &2120473612711573367
GameObject:
m_ObjectHideFlags: 0
Assets/Prefabs/UI/DlgInstall.prefab
+4
View File
@@ -16314,6 +16314,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -37
objectReference: {fileID: 0}
- target: {fileID: 6102967088919909530, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_Name
value: item_info
Assets/Prefabs/UI/DlgUninstall.prefab
+7 -3
View File
@@ -15955,7 +15955,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 948.02
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_LocalPosition.x
@@ -16021,13 +16021,17 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -37
objectReference: {fileID: 0}
- target: {fileID: 6102967088919909530, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: 10.8
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
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
@@ -16055,7 +16059,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 928.02
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
Assets/Scripts/CECHostPlayer.Inventory.cs
+4 -1
View File
@@ -780,7 +780,10 @@ namespace BrewMonster
}
m_pPack.RemoveItem(pCmd.chip_idx, 1);
if (pTessera is EC_IvtrStone stone)
{
AddMoneyAmount(-(int)stone.GetDBEssence().install_price);
}
// Refresh equip's data
// todo make receive request
UnityGameSession.c2s_CmdGetItemInfo(Inventory_type.IVTRTYPE_PACK, pCmd.equip_idx);
Assets/Scripts/CECHostPlayer.Pet.cs
+3 -1
View File
@@ -213,6 +213,7 @@ namespace BrewMonster
return false;
}
AddMoneyAmount(-pEgg.GetDBEssence().money_hatched);
UnityGameSession.c2s_CmdNPCSevHatchPet(iIvtrIdx, pItem.GetTemplateID());
return true;
@@ -248,9 +249,10 @@ namespace BrewMonster
return false;
}
AddMoneyAmount(-pdbe.money_restored);
UnityGameSession.c2s_CmdNPCSevRestorePet(iPetIdx);
return true;
}
}
}
}
Assets/Scripts/CECHostPlayer.cs
+13
View File
@@ -547,6 +547,9 @@ namespace BrewMonster
case EC_MsgDef.MSG_HST_PICKUPMONEY:
OnMsgHstPickupMoney(Msg);
break;
case EC_MsgDef.MSG_HST_SPENDMONEY:
OnMsgHstSpendMoney(Msg);
break;
case EC_MsgDef.MSG_HST_ATKRESULT: OnMsgHstAttackResult(Msg); break;
case EC_MsgDef.MSG_HST_ATTACKONCE: OnMsgHstAttackOnce(Msg); break;
case EC_MsgDef.MSG_HST_ATTACKED: OnMsgHstAttacked(Msg); break;
@@ -630,6 +633,16 @@ namespace BrewMonster
BubbleText((int)BubbleTextType.BUBBLE_MONEY, (uint)pCmd.amount);
}
private void OnMsgHstSpendMoney(ECMSG msg)
{
var data = msg.dwParam1 as byte[];
if (data == null || data.Length == 0)
return;
cmd_spend_money pCmd = GPDataTypeHelper.FromBytes<cmd_spend_money>(data);
AddMoneyAmount(-(int)pCmd.cost);
}
private void BubbleText(int iIndex, uint dwNum, int p1 = 0)
{
bool isHost = IsHostPlayer();