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

164 Commits

Author SHA1 Message Date
Cold-Mint
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
Cold-Mint
dea683dbc5
No backpack nesting backpack. 
禁止背包嵌套背包。
 2024-06-25 22:11:19 +08:00
Cold-Mint
d587c4fc01
Separation NodeUtils InstantiatePackedScene method. 
分离NodeUtils.InstantiatePackedScene方法。
 2024-06-24 22:19:12 +08:00
Cold-Mint
b7f72c0456
Add item generator. 
加入物品生成器。
 2024-06-22 23:29:24 +08:00
Cold-Mint
18d9ccb8ab
Adjust the namespace. 
调整命名空间。
 2024-06-22 19:21:06 +08:00
Cold-Mint
53f830d5a6
Fixed an issue where items could not be thrown. 
修复无法扔出物品的问题。
 2024-06-21 22:55:31 +08:00
Cold-Mint
309a7b73d2
Remove item slots. 
移除物品槽位。
 2024-06-21 19:16:40 +08:00
Cold-Mint
5d6d42aa54
Adds the selected slot change event to the item container. 
加入物品容器选中的槽位改变事件。
 2024-06-20 00:02:32 +08:00
Cold-Mint
1e5b466c6f
Add whether the item is selected.Adjust the display logic of the backpack UI. 
加入物品是否被选择。调整背包UI的显示逻辑。
 2024-06-19 22:33:00 +08:00
Cold-Mint
a58ddeb039
Optimized drag and drop of items. 
优化物品的拖拽。
 2024-06-18 23:37:18 +08:00
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
霧雨烨
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
Cold-Mint
7805a63174
Fixed an issue where items on the ground still carry collision damage. 
解决物品在地面上，仍然带有碰撞伤害的问题。
 2024-06-11 22:16:10 +08:00
霧雨烨
0880feb298 Add new item interfaces and manager 2024-06-10 23:08:48 +08:00
Cold-Mint
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
Cold-Mint
f7ad69440c
Add a loot table. 
添加战利品表。
 2024-06-09 22:05:49 +08:00
Cold-Mint
05763c25b1
Created the ability to drop items on the ground after the player dies. 
制作玩家死亡后，背包物品掉在地上的功能。
 2024-06-08 23:59:24 +08:00
霧雨烨
871ea247f0 Replaced hard-coded MaxSloganIndex with automatically fetched Slogan counts on load 2024-06-08 20:27:02 +08:00
Cold-Mint
5ca995d689
Supports throwing items out of a specific item slot. 
支持扔出特定物品槽内的物品了。
 2024-06-06 22:43:07 +08:00
Cold-Mint
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
Cold-Mint
4c61f3b50e
Remove unused source files. Fixed an issue where the health tank was empty after resurrection. 
移除未使用的源文件。修复复活后生命槽为空的问题。
 2024-06-05 22:15:23 +08:00
Cold-Mint
39ca716e3d
Conduct code reviews. 
进行代码审查。
 2024-06-05 21:38:45 +08:00
Cold-Mint
2a836e32e6
Support for restarting the game. 
支持重新开始游戏了。
 2024-06-04 22:23:06 +08:00
Cold-Mint
74c85cd5a7
Support for generating creatures on the map, adding the game end screen. 
支持在地图上生成生物了，加入了游戏结束的画面。
 2024-06-03 22:58:59 +08:00
Cold-Mint
64688252f0
Fixed an issue where players could not pick up items. 
修复玩家不能拾起物品的问题。
 2024-06-02 22:25:07 +08:00
Cold-Mint
b474ac0ed3
Support to detect when the player has entered or exited the room. 
支持检测玩家进入或退出房间了。
 2024-06-02 21:48:38 +08:00
Cold-Mint
db402ab7b2
Supports spawning players at birth points. 
支持将玩家生成在出生点。
 2024-05-31 22:26:38 +08:00
Cold-Mint
91cffd4866
Adjust the test based on the time range of the room injector. 
调整测试基于时间范围的房间注入器。
 2024-05-31 20:37:15 +08:00
Cold-Mint
a957c91ffe
Add probability-based and time-interval based room injection processors. 
加入基于概率的和基于时间间隔的房间注入处理器。
 2024-05-30 22:49:54 +08:00
Cold-Mint
959dcc3092
Add room injection processor. 
加入房间注入处理器。
 2024-05-28 22:14:35 +08:00
Cold-Mint
ea319f032e
Resolved an issue where the room slots were not used but marked as matching when generating a map with multiple forks, resulting in no forks being generated. 
解决生成多岔道的地图时，房间槽未使用但被标记为匹配，导致无法生成岔道的问题。
 2024-05-27 23:10:56 +08:00
Cold-Mint
0c0adf3a25
Tag is now supported when creating a room. 
创建房间时支持指定Tag了。
 2024-05-27 22:10:05 +08:00
Cold-Mint
4b9bac6ac7
Fixed an issue where banners would not display properly. 
修复标语不能正常显示的问题。
 2024-05-26 22:04:28 +08:00
Cold-Mint
fdb8b88c1e
Fixed an issue where maps could not be generated after exporting the project. 
解决导出项目后，无法生成地图的问题。
 2024-05-26 19:09:43 +08:00
Cold-Mint
b0da4b049e
Improve the log of map generator. 
完善地图生成器的日志。
 2024-05-26 11:10:21 +08:00
Cold-Mint
ace9ba5b65
Solve the problem of room overlap. 
解决房间重叠问题。
 2024-05-26 00:02:00 +08:00
Cold-Mint
5ec6b3065b
Distinguish log levels to solve the problem of overlapping room splicing borders. 
区分日志等级，解决房间拼接边框重叠的问题。
 2024-05-24 22:58:52 +08:00
Cold-Mint
c73bc185a5
Add the Generate map button used in the test to adjust the room selection algorithm. 
加入测试使用的生成地图按钮，调整房间的选取算法。
 2024-05-23 21:58:49 +08:00
Cold-Mint
4023d1d870
Calculation algorithm for optimizing room location. 
优化房间位置的计算算法。
 2024-05-23 20:52:52 +08:00
Cold-Mint
16a2a1d551
Algorithms for adjusting room placement. 
调整房间放置的算法。
 2024-05-22 22:39:41 +08:00
Cold-Mint
544c5303f3
Fixed an issue where the return path of the room template set was invalid, the initial room placement was extracted separately from the new method and added to the seed of map generation. 
修复房间模板集返回路径无效的问题，初始房间的放置被单独提取出新的方法，加入地图生成时的种子。
 2024-05-21 22:50:33 +08:00
Cold-Mint
529d5e95b5
Adjust the map generator. 
调整地图生成器。
 2024-05-20 22:38:41 +08:00
Cold-Mint
dd2577cfd0
Add sequential layout diagram parsing policies. 
添加顺序的布局图解析策略。
 2024-05-19 22:32:34 +08:00
Cold-Mint
e902974a14
Refactoring the top layer algorithm of the map generator and updating the readme. 
重构地图生成器的顶层算法，更新readme。
 2024-05-19 20:29:32 +08:00
Cold-Mint
f07b073dc6
Refactoring map generator, updating readme. 
重构地图生成器，更新readme。
 2024-05-18 23:35:12 +08:00
Cold-Mint
250bd53392
Support to delete the selected node, the room template edit box for anti-shake processing. 
支持删除选中的节点了，对房间模板编辑框进行防抖处理。
 2024-05-17 22:08:19 +08:00
Cold-Mint
e0723ec261
Supports loading and saving hierarchy diagrams from json files now. 
支持加载和保存层级图从json文件了。
 2024-05-16 22:46:03 +08:00
Cold-Mint
c9dd33b840
Remove useless dependencies and modify incorrect comments. 
移除无用依赖，修改错误的注释。
 2024-05-15 22:08:52 +08:00
Cold-Mint
2e64f57749
Support for saving node data to json files. 
支持将节点数据转存为json文件了。
 2024-05-15 21:52:07 +08:00
Cold-Mint
2fded22910
Attempt to serialize node data. 
尝试序列化节点数据。
 2024-05-14 22:26:33 +08:00
Cold-Mint
968fa7d723
Support for connecting nodes. Adding taglines does not require changing random ranges in the code. 
支持连接节点了。添加标语无需到代码内修改随机范围了。
 2024-05-12 23:06:07 +08:00