Cold-Mint/Traveller
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
129 Commits 1 Branch 2 Tags 3.1 MiB
c1f0e30671
Commit Graph

104 Commits

Author SHA1 Message Date
Cold-Mint
c1f0e30671
Backpack Ui will not prevent clicking the button below anymore. 
背包Ui不会阻止点击下面的按钮了。
 2024-06-17 22:12:51 +08:00
Cold-Mint
8391396191
Level graphs migrated to yaml. 
关卡图迁移到yaml。
 2024-06-16 22:44:50 +08:00
Cold-Mint
1a25325aa8
Merge branch 'master' into loot_rebuild 2024-06-16 20:22:25 +08:00
Cold-Mint
adeda2f786
Support display backpack page. 
支持展示背包页面。
 2024-06-16 20:18:44 +08:00
霧雨烨
3063680786 Add CanPutInPack property of IItem 2024-06-16 18:41:26 +08:00
霧雨烨
ced2618a5e Fixed a bug where the last item always looted in the same loot group 
修复了同一个掉落组中总是掉落最后一项的bug
 2024-06-16 18:35:00 +08:00
霧雨烨
703c19d09f fix a bug from a spelling mistake 2024-06-16 17:38:54 +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
霧雨烨
2d3fa08d0d Replaced all hardcoded stringName call. 
移除了所有硬编码的StringName调用。
 2024-06-16 17:09:40 +08:00
霧雨烨
40b52abb48 fixed bug, add return for CreateItem 2024-06-16 17:05:19 +08:00
霧雨烨
abf03c00a1 Preliminary rewrite of the loot system 
初步重写掉落系统
 2024-06-16 16:56:45 +08:00
Cold-Mint
db0a2fa1ee
Add PickAbleItem.Change item icon and backgrounds. 
加入可拾捡物，更换物品图标和背景。
 2024-06-16 15:28:16 +08:00
霧雨烨
edaa490b5b Updated WeaponTemplate's FiringInterval calculation so that it can be changed by FiringIntervalAsMillisecond even after instantiation. 
更新了WeaponTemplate的FiringInterval计算方式以使该值即便在实例化之后也可通过FiringIntervalAsMillisecond更改
 2024-06-15 17:16:41 +08:00
霧雨烨
197930f446 Support for optional custom parameters for registering item information from yaml 
为从yaml注册物品信息提供了可选自定义参数的支持
 2024-06-15 17:07:50 +08:00
霧雨烨
9a83fd1dd2 Creates a non-generic overload for NodeUtils.InstantiatePackedScene<T> and removes the Try-Catch block from the generic version 
为NodeUtils.InstantiatePackedScene<T>创建非泛型重载，并移除泛型版本中的Try-Catch块
 2024-06-15 17:07:02 +08:00
霧雨烨
4f2a6e8110 Split loops and extract functions 2024-06-15 14:30:22 +08:00
霧雨烨
2661fd2735 Fixed the bug that GetItem returns null when the PacksackStack is not empty 2024-06-15 09:04:16 +08:00
Cold-Mint
4077d77b32
Add a contributor page. 
添加贡献者页面。
 2024-06-15 00:14:17 +08:00
霧雨烨
8ea04f00be Move RegisterFromFile to ItemTypeRegister.cs 2024-06-14 22:38:29 +08:00
Cold-Mint
30a0a6539f
Merge branch 'master' of github.com:Cold-Mint/Traveller 2024-06-14 19:33:21 +08:00
Cold-Mint
a57416c7a9
Merge branch 'master' of github.com:Cold-Mint/Traveller 2024-06-14 19:26:49 +08:00
Cold-Mint
b018165e3c
Remove ambiguous comments. 
移除有歧义的注释。
 2024-06-14 19:25:48 +08:00
霧雨烨
bb44d77805 Ban Packsack nesting 
禁止背包嵌套
 2024-06-14 19:12:06 +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
霧雨烨
b35fb50073 Subdivision of Misc and Action from UI translation files. 2024-06-14 00:43:31 +08:00
霧雨烨
0efb3d9abf Merge remote-tracking branch 'refs/remotes/upstream/master' 
# Conflicts:
#	scripts/item/ItemTypeManager.cs
 2024-06-14 00:23:45 +08:00
霧雨烨
e26db60790 Add the prefix "ui_" to the translation items for game UI. 
Maybe did not cover all usage, sry for that.
 2024-06-14 00:12:06 +08:00
霧雨烨
9558829d15 Add the prefix "log_" to the translation items for the log function. 2024-06-13 23:54:41 +08:00
霧雨烨
3c33b055ab Add the feature to load simple item type information from yaml files 2024-06-13 23:50:07 +08:00
Cold-Mint
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
霧雨烨
dde7bb16ca Replace metadata of items with export vars 2024-06-13 11:14:24 +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
Cold-Mint
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
霧雨烨
3d6b71ef0c implement SingleItemStack, prepare for combine master 2024-06-12 21:53:27 +08:00
Cold-Mint
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
霧雨烨
7f20a7233c Initial migration of existing item interactions to the new interface 2024-06-12 01:57:55 +08:00