霧雨烨 d12ddc566b Merge remote-tracking branch 'refs/remotes/origin/master' into item_refactory ... # Conflicts: # locals/Item.csv # locals/Weapon.en.translation # locals/Weapon.ja.translation # locals/Weapon.zh.translation # scripts/inventory/UniversalItemContainer.cs # scripts/utils/NodeUtils.cs		2024-06-13 10:15:15 +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 remote-tracking branch 'refs/remotes/origin/master' into item_refactory	2024-06-13 10:15:15 +08:00
Player.cs	Merge remote-tracking branch 'refs/remotes/origin/master' into item_refactory	2024-06-13 10:15:15 +08:00