Commit Graph

55 Commits

Author SHA1 Message Date
1b440b828f
Fixed an issue where the number of weapons to be picked up after being thrown is 0, making it impossible to throw them again.
解决武器扔出后再捡起数量为0,导致无法再次扔出的问题。
2024-06-25 23:54:37 +08:00
dea683dbc5
No backpack nesting backpack.
禁止背包嵌套背包。
2024-06-25 22:11:19 +08:00
d587c4fc01
Separation NodeUtils InstantiatePackedScene method.
分离NodeUtils.InstantiatePackedScene方法。
2024-06-24 22:19:12 +08:00
b7f72c0456
Add item generator.
加入物品生成器。
2024-06-22 23:29:24 +08:00
18d9ccb8ab
Adjust the namespace.
调整命名空间。
2024-06-22 19:21:06 +08:00
53f830d5a6
Fixed an issue where items could not be thrown.
修复无法扔出物品的问题。
2024-06-21 22:55:31 +08:00
309a7b73d2
Remove item slots.
移除物品槽位。
2024-06-21 19:16:40 +08:00
5d6d42aa54
Adds the selected slot change event to the item container.
加入物品容器选中的槽位改变事件。
2024-06-20 00:02:32 +08:00
1e5b466c6f
Add whether the item is selected.Adjust the display logic of the backpack UI.
加入物品是否被选择。调整背包UI的显示逻辑。
2024-06-19 22:33:00 +08:00
a58ddeb039
Optimized drag and drop of items.
优化物品的拖拽。
2024-06-18 23:37:18 +08:00
c1f0e30671
Backpack Ui will not prevent clicking the button below anymore.
背包Ui不会阻止点击下面的按钮了。
2024-06-17 22:12:51 +08:00
Cold-Mint
1a25325aa8
Merge branch 'master' into loot_rebuild 2024-06-16 20:22:25 +08:00
adeda2f786
Support display backpack page.
支持展示背包页面。
2024-06-16 20:18:44 +08:00
霧雨烨
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
霧雨烨
2484bff229 Replaced a while(true); 2024-06-16 17:22:43 +08:00
霧雨烨
abf03c00a1 Preliminary rewrite of the loot system
初步重写掉落系统
2024-06-16 16:56:45 +08:00
db0a2fa1ee
Add PickAbleItem.Change item icon and backgrounds.
加入可拾捡物,更换物品图标和背景。
2024-06-16 15:28:16 +08:00
4077d77b32
Add a contributor page.
添加贡献者页面。
2024-06-15 00:14:17 +08:00
30a0a6539f
Merge branch 'master' of github.com:Cold-Mint/Traveller 2024-06-14 19:33:21 +08:00
b018165e3c
Remove ambiguous comments.
移除有歧义的注释。
2024-06-14 19:25:48 +08:00
霧雨烨
0f9e7d0283 Change the index parameter when adding a slot to ItemContainer to automatically get the latest index , add a test slot for Packsack item
更改ItemContainer添加槽位时的index参数为自动获取最新索引,为Packsack加入一个测试用槽位
2024-06-14 12:44:31 +08:00
霧雨烨
e5664f1553 Add PacksackStack for item Packsack
为Packsack物品添加PacksackStack
2024-06-14 12:22:44 +08:00
b8b8e81d8f
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
霧雨烨
662e9b136a move Packsack.cs to item namespace 2024-06-13 14:18:25 +08:00
霧雨烨
9561b46e1b Clean up the code and fill in the comments 2024-06-13 14:13:55 +08:00
霧雨烨
229098b261 Added all basic item stacks;
Move item stacks to new namespace
2024-06-13 14:05:59 +08:00
霧雨烨
e307a58299 Make packsack new interface, too. 2024-06-13 11:04:51 +08:00
霧雨烨
c1aecf21d7 Implements IEnumerable<ItemSlotNode> for IItemContainer. 2024-06-13 10:43:54 +08:00
霧雨烨
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
霧雨烨
23877e82cc Remove old item interfaces,rename new
移除旧的物品接口,重命名新的
2024-06-13 03:07:55 +08:00
霧雨烨
94a2e78efc Fixed all the bugs that prevented the game from working, added static item registration on startup
阻碍游戏运行的bug已尽数修复,添加启动时的静态物品注册
2024-06-13 03:04:12 +08:00
霧雨烨
16a2d40501 It's done. 2024-06-13 01:51:51 +08:00
霧雨烨
16b3a5a106 UniversalItemContainer refactored done
UniversalItemContainer调教完成
2024-06-13 01:18:55 +08:00
f219380a5f
Add a backpack for testing.
加入测试使用的背包。
2024-06-12 23:42:35 +08:00
霧雨烨
76daa88bac Merge branch 'refs/heads/master' into item_refactory_combined
# Conflicts:
#	locals/Slogan.ja.translation
#	scripts/character/CharacterTemplate.cs
#	scripts/character/Player.cs
#	scripts/inventory/HotBar.cs
#	scripts/inventory/IItemContainer.cs
#	scripts/item/weapon/ProjectileWeapon.cs
#	scripts/item/weapon/WeaponTemplate.cs
2024-06-12 22:13:55 +08:00
856a957c6a
Extracted from UniversalItemContainer.
提取UniversalItemContainer类。
2024-06-12 21:33:29 +08:00
霧雨烨
9b3701b49c (temp):ItemSlot has already changed into new interfaces 2024-06-12 17:57:38 +08:00
霧雨烨
e9656d6992 (temp):
Just a small refactoring in the huge interaction code (regarding ItemSlot and ItemStack), but I think it's necessary to leave a save point, after all, I have to go to sleep first
2024-06-12 02:22:04 +08:00
霧雨烨
026c7ff32f Add single item stack type, move the weapon namespace into the item namespace, and I think it's ready to be merged into the new interface 2024-06-12 00:51:40 +08:00
63a56cbb2c
Unified management scenario instantiation, loot generation in the right place, and allow to specify the probability and quantity.
统一管理场景实例化,战利品生成在正确的位置,且允许指定概率和数量了。
2024-06-10 21:05:18 +08:00
f7ad69440c
Add a loot table.
添加战利品表。
2024-06-09 22:05:49 +08:00
05763c25b1
Created the ability to drop items on the ground after the player dies.
制作玩家死亡后,背包物品掉在地上的功能。
2024-06-08 23:59:24 +08:00
5ca995d689
Supports throwing items out of a specific item slot.
支持扔出特定物品槽内的物品了。
2024-06-06 22:43:07 +08:00
95515ddab2
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.
当选中物品槽A时,再次按下物品槽A的快捷键,就不能再调用A的按下事件了。
2024-06-06 21:05:51 +08:00
5ec6b3065b
Distinguish log levels to solve the problem of overlapping room splicing borders.
区分日志等级,解决房间拼接边框重叠的问题。
2024-05-24 22:58:52 +08:00
222d26441e
Improve empty references and improve code robustness.
改善空引用,提升代码健壮性。
2024-05-08 18:22:04 +08:00
802eb599da
Fixed an issue where the health bar was drawn incorrectly.
修复健康条绘制不正确的问题。
2024-05-07 17:38:50 +08:00
9435f76fc0
Adjust the logic of how the player picks up items.
调整玩家捡起物品的逻辑。
2024-05-06 18:59:39 +08:00
801b3dd93b
Supports the use of mouse wheel to switch currently held items.
支持使用鼠标滚轮切换当前持有的物品了。
2024-05-04 22:59:46 +08:00
b7939af5d0
Supports the use of mouse wheel and keyboard number keys to adjust HotBar selected items.
支持使用鼠标滚轮和键盘数字键调整HotBar选中的项目了。
2024-05-03 22:35:54 +08:00