霧雨烨
|
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 |
|
霧雨烨
|
197930f446
|
Support for optional custom parameters for registering item information from yaml
为从yaml注册物品信息提供了可选自定义参数的支持
|
2024-06-15 17:07:50 +08:00 |
|
霧雨烨
|
2661fd2735
|
Fixed the bug that GetItem returns null when the PacksackStack is not empty
|
2024-06-15 09:04:16 +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 |
|
霧雨烨
|
bb44d77805
|
Ban Packsack nesting
禁止背包嵌套
|
2024-06-14 19:12:06 +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 |
|
霧雨烨
|
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 |
|
