Commit Graph

449 Commits

Author SHA1 Message Date
Nyutanislavsky
b92e61db3f
Fix (#404)
1. processPrompt恢复dest的getPlayerStr
2. 武将一览中隐藏隐藏技能
2024-10-26 00:05:17 +08:00
notify
dedf769e97
Fixbug2 (#405)
* 修复录像可见性问题 并增加查看未知牌功能
* 给qml绑定上role_shown属性,以便更新
* 修复从非隐藏卡牌区域删除卡牌时卡牌的known不受moveData干涉
* 给askForCardChosen和poxi贴了个visible_data
* 修复捡垃圾会导致手牌重复触发onClicked
2024-10-25 23:13:05 +08:00
Ho-spair
3e75096e22
save prompt (#401)
Some checks are pending
Check Whitespace and New Line / check (push) Waiting to run
Deploy Doxygen to Pages / build (push) Waiting to run
Deploy Doxygen to Pages / deploy (push) Blocked by required conditions
2024-10-25 17:17:29 +08:00
notify
29d20089b4 忘了同步lua
Some checks are pending
Check Whitespace and New Line / check (push) Waiting to run
Deploy Doxygen to Pages / build (push) Waiting to run
Deploy Doxygen to Pages / deploy (push) Blocked by required conditions
2024-10-24 21:57:26 +08:00
YoumuKon
ed6ce84584
okcancelfix (#400)
- 修复了确认键亮起时取消键不可用的bug
- 将版本号改成0.4.21
2024-10-24 21:37:27 +08:00
notify
2be5fe61f5 typo 2024-10-24 18:58:08 +08:00
notify
196e92f5d3
Fixbug (#399)
Some checks are pending
Check Whitespace and New Line / check (push) Waiting to run
Deploy Doxygen to Pages / build (push) Waiting to run
Deploy Doxygen to Pages / deploy (push) Blocked by required conditions
* lua端的ob属性根本没同步,同步一下
* [需要C++] 让requestTimer的超时影响到Lua
* 修复windows没图标
* qmllint; remove modmaker
* 修理了选卡器
* 修理了确定取消消失
* 删除了已经不用的autoPending和respond_play
* 修复异常烧条(或许吧)
* 修复负数烧条时间,若为负数则无事发生
2024-10-24 16:41:06 +08:00
notify
30df075db2 Changelog: v0.4.20
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Doxygen to Pages / build (push) Has been cancelled
Deploy Doxygen to Pages / deploy (push) Has been cancelled
2024-10-22 01:14:01 +08:00
notify
220fb93b0e
杀了-1 (#393)
Co-authored-by: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
2024-10-22 00:03:42 +08:00
notify
210ca99d2f 再测试doxygen build
Some checks are pending
Check Whitespace and New Line / check (push) Waiting to run
Deploy Doxygen to Pages / build (push) Waiting to run
Deploy Doxygen to Pages / deploy (push) Blocked by required conditions
2024-10-21 15:09:25 +08:00
notify
0233746ead
补完反选按钮(顺便性能up) (#390) 2024-10-21 14:47:12 +08:00
notify
f0ffd68ff2
Doxygen and test (#385)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Doxygen to Pages / pages (push) Has been cancelled
- 删除ModMaker
- 拆出main.cpp以便CMake
- Doxygen注释,以及CI(没测试过)
2024-10-17 19:00:02 +08:00
Zheng Qu
354e0ba42e
Support MacOS (#365)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
通过这个PR,FreeKill可以在MacOS上编译运行。

在repo根目录运行 `./build/FreeKill`,游戏可玩,有背景音,但是出牌语音似乎没了。是我的运行方式有问题么?
2024-10-14 18:45:07 +08:00
notify
951a9a0497
UI rewrite2 (#371)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
基本上能玩了

---------

Co-authored-by: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
2024-10-13 10:38:55 +08:00
notify
fa8335a330
UI rewrite (#367)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
TODOS
========

手气卡、重铸、本轮跳过无懈
----------

禁用理由、Target脸上提示(可烈弓)
----------

**修bug**

---------

Co-authored-by: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
2024-09-19 00:31:49 +08:00
Ho-spair
7b66e304ff
选择目标提示 (#366) 2024-09-19 00:00:58 +08:00
Nyutanislavsky
e8aacf1888
Enhancement (#362)
1. 新增隐藏礼物选项
2. 无效技能ui显示🔒
3. 过期房间字符串显示删除线
5. 按钮键长按查看技能详情
6. 筛选房间功能
7. “禁用lua扩展”禁用
8. 调整服务器“从收藏移除”的ui,改为三点展开
9. 调整红温缩进
10. 房间内限制玩家名称长度(自己除外)
11. 玩家详情显示判定区
12. 房间内一览
13. 武将一览语音键增加按钮复制代码与文本(长按复制代码),悬停显示
14. 手牌排序多选:(默认)类型、点数、花色
15. 技能次数提示,指定为正数或0显示
16. 修复ArrangeCardsBox的报错
17. 手牌拖拽排序
18. 武将技能按顺序添加
2024-09-18 23:53:38 +08:00
notify
3d942a24b0 remove dangerous file
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
2024-08-22 14:37:43 +08:00
notify
6ccfe29998 Update via upload
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
2024-08-01 15:50:58 +08:00
notify
5946f6d1cf 修复换服时报密码错bug
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
2024-07-03 11:52:03 +08:00
notify
76c9b02623 Fix windows build problem: use std::getline 2024-07-03 10:32:35 +08:00
notify
60fc264285 Changelog: v0.4.19 2024-07-03 10:14:19 +08:00
YoumuKon
e121233e9d
观星美化 (#361)
拖拽卡牌悬停时可以显示金色包边
2024-07-03 09:57:06 +08:00
notify
0325c73443
Serverlist (#360)
Some checks are pending
Check Whitespace and New Line / check (push) Waiting to run
Deploy Sphinx documentation to Pages / pages (push) Waiting to run
## 服务器列表

- 重制了之前的加入服务器与保存密码的页面,以及功能
- 密码在本地以明文保存
- 根据游戏目录中的server-list.json读取公共服务器列表,还没做自动更新
- 可能有不少bug
2024-07-03 01:31:22 +08:00
notify
79ede70b6b
Shell enhance (#359)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
- 修复了Log淹没正在输入命令的bug
- 增加Tab补全:命令补全、install链接推荐、用户名补全、拓展包名补全
- 为Windows端增加基于cstdio的getline函数的丐版shell
2024-07-01 00:28:03 +08:00
YoumuKon
bdfcf805e4 fix (#358)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
- 修复了装备牌格式报错的bug
- 修复了副将相关bug
2024-06-27 18:56:21 +08:00
notify
d11bf58cb4
Reconnect fix (#357)
Some checks failed
Check Whitespace and New Line / check (push) Has been cancelled
Deploy Sphinx documentation to Pages / pages (push) Has been cancelled
修复一系列炸服
修复大厅太辣眼睛的bug
2024-06-11 14:19:39 +08:00
notify
d94b483f66 Changelog: v0.4.16 2024-06-10 18:21:16 +08:00
YoumuKon
5090bdba77
Dev bugfix (#352)
- 搬运了ArrangeCards。
- 优化了GuanxingBox的操作
- 修复了不能及时更新技能prompt的bug
- 取消目标后会刷新目标选择
- 完备了借刀的牌名

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2024-06-10 15:02:46 +08:00
Nyutanislavsky
4235bf6237
enhance processPrompt (#355)
1. 改进processPrompt,支持双将和暗将
2. 副将长名旋转
3. 国战体力上限优化,包括一览和选将框
4. 空格添加结束出牌阶段,Escape键呼出菜单
5. 武将一览左栏文本换行
6. 同名替换影响已选择的武将
7. 再次排序手牌时按照点数排序
8. Logic.js翻译
9. 进入房间翻译删去句号,跟房间内其他toast风格统一
10. 常见疑问最后一张“下一条”改为“OK!”
11. 录像回放“从文件打开”翻译
12. interaction自动弹出和关闭,comboBox补技能名
13. 卡牌音效添加装备效果音效和使用音效,小小重构
14. activeSkill的prompt的selected_targets实装
15. 禁用扩展包文本ui限制长度
16. 右键技能呼出气泡
Qsgs-Fans/freekill-core#3
2024-06-10 14:58:48 +08:00
notify
ebc5675ead
Cppdev (#356)
- 修改cpp代码
- 与之配合修改了相关lua代码

!注意从此开始,lua代码的更新转移到freekill-core仓库
Qsgs-Fans/freekill-core#1
2024-06-10 14:58:31 +08:00
notify
766e93378e Changelog: v0.4.15 2024-04-20 10:57:07 +08:00
YoumuKon
b34343317f
轻量级bugfix (#351)
- 修复了造成无来源伤害牌的bug
- 修复了从处理区获得的牌仍然偏转的bug
- 修复了甩不掉新手保护的bug
- 优化了移动牌显示
2024-04-20 10:04:21 +08:00
notify
955be51226 Changelog: v0.4.14 2024-04-19 22:38:00 +08:00
notify
f419bd555d Changelog: v0.4.13 2024-04-19 21:36:58 +08:00
YoumuKon
a433b1a9ed
Dev bugfix (#344)
- 实装了by_user用以检定“使用牌造成伤害”
- 实装Fk.lords以快速查找主公武将
- 添加moveMark以在移动后(前一刻)赋予标记
- 实装-inarea后缀,移动后若不在对应区域会被立即移除
- 为system_enum补全注释
- 内置神将映射
- 修复了小乔转酒杀导致二连击的bug
- 修复了askForCardsChosen烧条后不自动抓取的bug

---------

Co-authored-by: Nyutanislavsky <nyutanislavsky@qq.com>
2024-04-19 21:35:29 +08:00
notify
9d9217da2c
Cppdev (#350)
- 对旁观和重连进行优化,减轻服务器CPU负担
- 加强Lua与C++交互能力,现在可以直接传const QVariant &参数
- 借助上一条,删除了客户端侧代码绝大多数冗余的json.encode/JSON.parse
- 微调swig代码减少生成量,将int映射到lua integer而不是number
2024-04-19 20:53:19 +08:00
xxyheaven
2be00fb3b0
fix (#343)
修正从牌堆底获取牌的顺序问题
2024-04-19 20:51:18 +08:00
BKDOLL
e6ce767e0f
Fix (#347)
身份标记修复
2024-04-19 20:50:53 +08:00
notify
3dbd415167 Changelog: v0.4.12 2024-04-07 14:43:39 +08:00
notify
78b7e332d8 Changelog: v0.4.11 2024-04-07 00:57:47 +08:00
xxyheaven
913e4b832f
Player.NotActive (#342) 2024-04-07 00:55:44 +08:00
YoumuKon
e75836ff8d
bugfix (#339)
- 改造常备主逻辑,现在常备主会根据可用多余将数调整
- 改良了getCardArea
- 重新启用将框不足提醒
- 修复了司马懿问打出牌的bug
- 修复了白名单武将不存在时无法创房的bug

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2024-04-07 00:51:29 +08:00
Nyutanislavsky
30e33f92c7
Enhance (#338)
1. 国战选将框动态显示珠联璧合(等待更清晰的图…)
2. 废除和恢复区域log
3. 搬运isMale,isFemale,compareDistance,hasShownSkill
4. hasSkill如果是状态技,判断是否亮出,未亮出的返回false
5. 标准包调整,修复八卦阵,离间结姻用isMale
6. 亮将技能改用&后缀并详细化prompt
7. 拼点移动起点改为owner
8. 使用牌filter改为owner

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2024-04-07 00:45:55 +08:00
notify
1a4da186d2
Hotfix (#340)
服务端热更新功能

当调用upgrade命令后,会创建更加新的roomthread
(!完全没测试过)
2024-04-07 00:35:57 +08:00
xxyheaven
873d68363c
fix bug (#337)
1、给carditem增加dragging参数;
2、filterskill在mute的情况下不播放技能特效;
3、给ActiveSkill增加no_indicate参数
4、回合开始时、结束时这两个时机当前回合角色的phase设置为Player.None
5、给usecard增加noIndicate参数
2024-04-07 00:21:15 +08:00
notify
e959c649f1 Changelog: v0.4.10 2024-04-02 01:04:57 +08:00
notify
9dd4f55c86
单机热更新,以及Docker (#336)
以及emo公主的判定小卡换图

---------

Co-authored-by: seven <786852516@qq.com>
2024-04-02 01:00:10 +08:00
YoumuKon
e840a3b322
bugfix (#328)
- 为findParent添加深度限制参数(默认无限制)
- 搬运了damageByCardEffect
- 修复了ex__choose_skill
- 修复了华佗、吕蒙和古锭刀
- 添加势力映射,可以指定一个势力必须变成其他几个势力之一(需要神话再临包/OL包自行处理神将变将范围)
- askForCardsChosen界限突破,改成了基于askForPoxi的格式
- 修复了空城虚拟杀可以方天的bug
- 给强制平局添加了原因提醒
- 优化了移动牌的视觉逻辑
2024-04-02 00:56:04 +08:00
notify
75d0ad55c8
写了些没啥用处的lua Test (#335)
可以玩玩看
2024-04-01 14:53:58 +08:00