霧雨烨 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
..
HotBar.cs	Change the index parameter when adding a slot to ItemContainer to automatically get the latest index , add a test slot for Packsack item	2024-06-14 12:44:31 +08:00
IItemContainer.cs	Add PickAbleItem.Change item icon and backgrounds.	2024-06-16 15:28:16 +08:00
ItemSlotNode.cs	Add PickAbleItem.Change item icon and backgrounds.	2024-06-16 15:28:16 +08:00
PacksackUi.cs	Add PickAbleItem.Change item icon and backgrounds.	2024-06-16 15:28:16 +08:00
UniversalItemContainer.cs	Replaced a while(true);	2024-06-16 17:22:43 +08:00