霧雨烨 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
..
AiCharacter.cs	When the selected item slot A is selected, pressing the shortcut key of item slot A again will no longer invoke the press event of A.	2024-06-06 21:05:51 +08:00
CharacterTemplate.cs	Merge branch 'refs/heads/master' into loot_rebuild	2024-06-16 17:32:29 +08:00
Player.cs	Add PickAbleItem.Change item icon and backgrounds.	2024-06-16 15:28:16 +08:00