From bdb476e16cd1737649292090813d3d30383910d1 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 08 七月 2025 16:40:09 +0800
Subject: [PATCH] 0312 物品叠加数量支持DWORD，背包大小支持WORD
---
Main/System/KnapSack/Logic/ItemModel.cs | 4 +-
Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs | 11 +++++
Main/System/KnapSack/PackManager.cs | 2
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0707_tagItemCountRefresh.cs | 8 ++--
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0706_tagUseItemSuccess.cs | 4 +-
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0704_tagRolePackRefresh.cs | 8 ++--
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0725_tagRolePackRefreshEx.cs | 8 ++--
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs.meta | 11 +++++
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0709_tagClearItem.cs | 4 +-
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0722_tagItemDeadLockRefresh.cs | 4 +-
Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs.meta | 11 +++++
Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs | 21 ++++++++++
12 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs
new file mode 100644
index 0000000..5afa5f7
--- /dev/null
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs
@@ -0,0 +1,11 @@
+using UnityEngine;
+using System.Collections;
+
+//07 15 鐗╁搧鍓╀綑鏃堕棿鍒锋柊#tagItemRemainHourRefresh
+
+public class DTC0715_tagItemRemainHourRefresh : DtcBasic {
+ public override void Done(GameNetPackBasic vNetPack) {
+ base.Done(vNetPack);
+ H0715_tagItemRemainHourRefresh vNetData = vNetPack as H0715_tagItemRemainHourRefresh;
+ }
+}
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs.meta b/Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs.meta
new file mode 100644
index 0000000..802b6af
--- /dev/null
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0715_tagItemRemainHourRefresh.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5228974a662e48144a13b7443a993ae9
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0704_tagRolePackRefresh.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0704_tagRolePackRefresh.cs
index 4fad8d6..1def8d0 100644
--- a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0704_tagRolePackRefresh.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0704_tagRolePackRefresh.cs
@@ -5,10 +5,10 @@
public class H0704_tagRolePackRefresh : GameNetPackBasic {
public byte PackType; //鑳屽寘绫诲瀷:rptItem, rptEquip, rptWarehouse
- public byte ItemPlace;
+ public ushort ItemPlace;
public uint ItemID;
public byte IsLocked; //鏄惁閿佸畾
- public ushort ItemCount; //鐗╁搧鏁伴噺
+ public uint ItemCount; //鐗╁搧鏁伴噺
public byte IsBind; //鏄惁缁戝畾
public uint GearScore; //璇勫垎
public uint RemainHour; //鍓╀綑鏃堕棿(灏忔椂)
@@ -23,10 +23,10 @@
public override void ReadFromBytes (byte[] vBytes) {
TransBytes (out PackType, vBytes, NetDataType.BYTE);
- TransBytes (out ItemPlace, vBytes, NetDataType.BYTE);
+ TransBytes (out ItemPlace, vBytes, NetDataType.WORD);
TransBytes (out ItemID, vBytes, NetDataType.DWORD);
TransBytes (out IsLocked, vBytes, NetDataType.BYTE);
- TransBytes (out ItemCount, vBytes, NetDataType.WORD);
+ TransBytes (out ItemCount, vBytes, NetDataType.DWORD);
TransBytes (out IsBind, vBytes, NetDataType.BYTE);
TransBytes (out GearScore, vBytes, NetDataType.DWORD);
TransBytes (out RemainHour, vBytes, NetDataType.DWORD);
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0706_tagUseItemSuccess.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0706_tagUseItemSuccess.cs
index e52a967..2628e4f 100644
--- a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0706_tagUseItemSuccess.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0706_tagUseItemSuccess.cs
@@ -6,7 +6,7 @@
public class H0706_tagUseItemSuccess : GameNetPackBasic {
public uint PlayerID;
public uint ItemID;
- public byte ItemIndex;
+ public ushort ItemIndex;
public H0706_tagUseItemSuccess () {
_cmd = (ushort)0x0706;
@@ -15,7 +15,7 @@
public override void ReadFromBytes (byte[] vBytes) {
TransBytes (out PlayerID, vBytes, NetDataType.DWORD);
TransBytes (out ItemID, vBytes, NetDataType.DWORD);
- TransBytes (out ItemIndex, vBytes, NetDataType.BYTE);
+ TransBytes (out ItemIndex, vBytes, NetDataType.WORD);
}
}
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0707_tagItemCountRefresh.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0707_tagItemCountRefresh.cs
index 8135aef..ce00b10 100644
--- a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0707_tagItemCountRefresh.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0707_tagItemCountRefresh.cs
@@ -5,8 +5,8 @@
public class H0707_tagItemCountRefresh : GameNetPackBasic {
public byte PackType;
- public byte ItemIndex;
- public ushort ItemCount;
+ public ushort ItemIndex;
+ public uint ItemCount;
public H0707_tagItemCountRefresh () {
_cmd = (ushort)0x0707;
@@ -14,8 +14,8 @@
public override void ReadFromBytes (byte[] vBytes) {
TransBytes (out PackType, vBytes, NetDataType.BYTE);
- TransBytes (out ItemIndex, vBytes, NetDataType.BYTE);
- TransBytes (out ItemCount, vBytes, NetDataType.WORD);
+ TransBytes (out ItemIndex, vBytes, NetDataType.WORD);
+ TransBytes (out ItemCount, vBytes, NetDataType.DWORD);
}
}
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0709_tagClearItem.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0709_tagClearItem.cs
index 905d378..d62ba7b 100644
--- a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0709_tagClearItem.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0709_tagClearItem.cs
@@ -5,7 +5,7 @@
public class H0709_tagClearItem : GameNetPackBasic {
public byte PackType;
- public byte ItemIndex;
+ public ushort ItemIndex;
public byte ClearType; //Type = TItemNotifyType
public H0709_tagClearItem () {
@@ -14,7 +14,7 @@
public override void ReadFromBytes (byte[] vBytes) {
TransBytes (out PackType, vBytes, NetDataType.BYTE);
- TransBytes (out ItemIndex, vBytes, NetDataType.BYTE);
+ TransBytes (out ItemIndex, vBytes, NetDataType.WORD);
TransBytes (out ClearType, vBytes, NetDataType.BYTE);
}
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs
new file mode 100644
index 0000000..12babf4
--- /dev/null
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs
@@ -0,0 +1,21 @@
+using UnityEngine;
+using System.Collections;
+
+//07 15 鐗╁搧鍓╀綑鏃堕棿鍒锋柊#tagItemRemainHourRefresh
+
+public class H0715_tagItemRemainHourRefresh : GameNetPackBasic {
+ public byte PackType;
+ public ushort ItemIndex;
+ public uint RemainHour;
+
+ public H0715_tagItemRemainHourRefresh () {
+ _cmd = (ushort)0x0715;
+ }
+
+ public override void ReadFromBytes (byte[] vBytes) {
+ TransBytes (out PackType, vBytes, NetDataType.BYTE);
+ TransBytes (out ItemIndex, vBytes, NetDataType.WORD);
+ TransBytes (out RemainHour, vBytes, NetDataType.DWORD);
+ }
+
+}
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs.meta b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs.meta
new file mode 100644
index 0000000..1b65684
--- /dev/null
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0715_tagItemRemainHourRefresh.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 059c835959d324246a979047ad681c66
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0722_tagItemDeadLockRefresh.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0722_tagItemDeadLockRefresh.cs
index 02df3da..5f55d90 100644
--- a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0722_tagItemDeadLockRefresh.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0722_tagItemDeadLockRefresh.cs
@@ -5,7 +5,7 @@
public class H0722_tagItemDeadLockRefresh : GameNetPackBasic {
public byte PackType;
- public byte ItemIndex;
+ public ushort ItemIndex;
public byte IsLock;
public H0722_tagItemDeadLockRefresh () {
@@ -14,7 +14,7 @@
public override void ReadFromBytes (byte[] vBytes) {
TransBytes (out PackType, vBytes, NetDataType.BYTE);
- TransBytes (out ItemIndex, vBytes, NetDataType.BYTE);
+ TransBytes (out ItemIndex, vBytes, NetDataType.WORD);
TransBytes (out IsLock, vBytes, NetDataType.BYTE);
}
diff --git a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0725_tagRolePackRefreshEx.cs b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0725_tagRolePackRefreshEx.cs
index 1eecc03..73e6168 100644
--- a/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0725_tagRolePackRefreshEx.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H07_PlayerItem/H0725_tagRolePackRefreshEx.cs
@@ -18,10 +18,10 @@
ItemInfo = new tagRoleItemRefresh[ItemCount];
for (int i = 0; i < ItemCount; i ++) {
ItemInfo[i] = new tagRoleItemRefresh();
- TransBytes (out ItemInfo[i].ItemPlace, vBytes, NetDataType.BYTE);
+ TransBytes (out ItemInfo[i].ItemPlace, vBytes, NetDataType.WORD);
TransBytes (out ItemInfo[i].ItemID, vBytes, NetDataType.DWORD);
TransBytes (out ItemInfo[i].IsLocked, vBytes, NetDataType.BYTE);
- TransBytes (out ItemInfo[i].ItemCount, vBytes, NetDataType.WORD);
+ TransBytes (out ItemInfo[i].ItemCount, vBytes, NetDataType.DWORD);
TransBytes (out ItemInfo[i].IsBind, vBytes, NetDataType.BYTE);
TransBytes (out ItemInfo[i].GearScore, vBytes, NetDataType.DWORD);
TransBytes (out ItemInfo[i].RemainHour, vBytes, NetDataType.DWORD);
@@ -33,10 +33,10 @@
}
public struct tagRoleItemRefresh {
- public byte ItemPlace;
+ public ushort ItemPlace;
public uint ItemID;
public byte IsLocked; //鏄惁閿佸畾
- public ushort ItemCount; //鐗╁搧鏁伴噺
+ public uint ItemCount; //鐗╁搧鏁伴噺
public byte IsBind; //鏄惁缁戝畾
public uint GearScore; //璇勫垎
public uint RemainHour; //鍓╀綑鏃堕棿(灏忔椂)
diff --git a/Main/System/KnapSack/Logic/ItemModel.cs b/Main/System/KnapSack/Logic/ItemModel.cs
index 67a38c8..6616357 100644
--- a/Main/System/KnapSack/Logic/ItemModel.cs
+++ b/Main/System/KnapSack/Logic/ItemModel.cs
@@ -162,7 +162,7 @@
{
itemId = (int)serverItem.ItemID;
index = serverItem.ItemPlace;
- count = serverItem.ItemCount;
+ count = (int)serverItem.ItemCount;
remainHour = (int)serverItem.RemainHour;
userData = serverItem.UserData;
guid = serverItem.ItemGUID;
@@ -174,7 +174,7 @@
{
itemId = (int)serverItem.ItemID;
index = serverItem.ItemPlace;
- count = serverItem.ItemCount;
+ count = (int)serverItem.ItemCount;
remainHour = (int)serverItem.RemainHour;
userData = serverItem.UserData;
guid = serverItem.ItemGUID;
diff --git a/Main/System/KnapSack/PackManager.cs b/Main/System/KnapSack/PackManager.cs
index c621633..1982acf 100644
--- a/Main/System/KnapSack/PackManager.cs
+++ b/Main/System/KnapSack/PackManager.cs
@@ -303,7 +303,7 @@
{
isAddItemCount = true;
}
- itemModel.RefreshCount(refresh.ItemCount);
+ itemModel.RefreshCount((int)refresh.ItemCount);
if (isAddItemCount)
{
--
Gitblit v1.8.0