霧雨烨 0efb3d9abf Merge remote-tracking branch 'refs/remotes/upstream/master' ... # Conflicts: # scripts/item/ItemTypeManager.cs		2024-06-14 00:23:45 +08:00
..
itemStacks	Review the merged code to resolve an issue where the game is unresponsive after a player dies.	2024-06-13 22:29:18 +08:00
weapon	Review the merged code to resolve an issue where the game is unresponsive after a player dies.	2024-06-13 22:29:18 +08:00
ICommonItem.cs	Review the merged code to resolve an issue where the game is unresponsive after a player dies.	2024-06-13 22:29:18 +08:00
IItem.cs	Review the merged code to resolve an issue where the game is unresponsive after a player dies.	2024-06-13 22:29:18 +08:00
ItemType.cs	Review the merged code to resolve an issue where the game is unresponsive after a player dies.	2024-06-13 22:29:18 +08:00
ItemTypeManager.cs	Merge remote-tracking branch 'refs/remotes/upstream/master'	2024-06-14 00:23:45 +08:00
Packsack.cs	move Packsack.cs to item namespace	2024-06-13 14:18:25 +08:00