霧雨烨 9c8d98da02 Merge branch 'refs/heads/master' into loot_rebuild ... # Conflicts: # data/itemRegs/weapons.yaml # locals/Log.csv # prefab/weapons/staffOfTheUndead.tscn # scripts/character/CharacterTemplate.cs # scripts/item/ItemTypeManager.cs # scripts/item/weapon/WeaponTemplate.cs # scripts/loader/uiLoader/MainMenuLoader.cs		2024-06-16 17:32:29 +08:00
..
itemStacks	Merge branch 'refs/heads/master' into loot_rebuild	2024-06-16 17:32:29 +08:00
weapon	Merge branch 'refs/heads/master' into loot_rebuild	2024-06-16 17:32:29 +08:00
ICommonItem.cs	Support for optional custom parameters for registering item information from yaml	2024-06-15 17:07:50 +08:00
IItem.cs	Remove ambiguous comments.	2024-06-14 19:25:48 +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	Replaced all hardcoded stringName call.	2024-06-16 17:09:40 +08:00
ItemTypeRegister.cs	Preliminary rewrite of the loot system	2024-06-16 16:56:45 +08:00
Packsack.cs	Add PickAbleItem.Change item icon and backgrounds.	2024-06-16 15:28:16 +08:00