Commit Graph

157 Commits

Author SHA1 Message Date
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
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
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
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
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
notify
955be51226 Changelog: v0.4.14 2024-04-19 22:38:00 +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
notify
3dbd415167 Changelog: v0.4.12 2024-04-07 14:43:39 +08:00
notify
1a4da186d2
Hotfix (#340)
服务端热更新功能

当调用upgrade命令后,会创建更加新的roomthread
(!完全没测试过)
2024-04-07 00:35:57 +08:00
notify
9dd4f55c86
单机热更新,以及Docker (#336)
以及emo公主的判定小卡换图

---------

Co-authored-by: seven <786852516@qq.com>
2024-04-02 01:00:10 +08:00
notify
7779f06411
Fixbug (#319)
修bug... 虽然不知道是不是修了
修那个gameOver触发时机的
注意了休整下投降仍未修复哦
先放个PR在这了
2024-02-17 09:47:17 +08:00
notify
c3cdb8dc50
Ai小添加 (#320)
出牌策略仍然搞不定呀
- Qml: 新增leval函数可获得lua表达式的值
- 新增AbstractRoom类 去除冗余
2024-02-17 09:46:48 +08:00
notify
ea65a3dd4b
优化 (#315)
- git报错优化
- 防止反复shutdown同一事件
2024-02-04 15:54:51 +08:00
notify
be03b04ef0
小修复&Qml美化 (#308)
- 修复了虚拟牌点数相加的bug
- 修复cleaner出错直接爆炸
- QML的代码将宽度控制到80以内
2024-01-25 03:23:29 +08:00
notify
51a10ebcf4
修小bug,分离事件栈 (#303) 2024-01-10 22:51:29 +08:00
notify
278e7ce4c6
游戏时长统计 (#302)
* 修复和完善qml mark
* 修复国战野心家放副将
* [需要编译] 统计游戏时长功能
* 后台也开始记录注册时间和上次上线的时间
* 现在会将屏蔽玩家保存到本地并标红提示
2023-12-28 12:11:24 +08:00
notify
d6cc608723 Changelog: v0.3.13 2023-12-10 19:19:34 +08:00
notify
94c1107c2e
Ui2 (#293)
小修小改,没啥新功能
2023-12-09 23:25:26 +08:00
notify
9a9fc9c105
UI (#290)
杀光侧栏 只留战报一个
Qml标记,以及一个割圆demo
自由选将增加搜索功能
room:setBanner,相当于公共标记了,客户端可以Fk:currentRoom():getBanner拿(当然服务端也可)
改掉两个很蠢的命名
2023-12-06 21:07:35 +08:00
notify
2ecaefb642 Changelog: v0.3.12 2023-11-08 02:00:21 +08:00
notify
379ea06970
English (#285) 2023-11-07 12:49:31 +08:00
notify
68f088e076
Enhancement2 (#281)
各种小改
2023-10-27 22:53:25 +08:00
YoumuKon
edf10893e9
bug fix (#277)
堆一堆
- 更改了许褚台词
- 让lua认为prompt可以是string
- 修改魄袭框,添加extra_data和cancelable
- 修复GetNcards的洗牌判定逻辑
- 为聊天添加300字符限制
2023-10-27 22:19:30 +08:00
似然可绘
6cc6dc93ef
Add resolution support for SRV (#278)
添加对服务器的SRV解析支持,已在WIndows11,Qt 6.6.0环境下通过测试
2023-10-18 20:34:48 +08:00
notify
183dae9ae1
Enhancement2 (#275)
- TODO: 好友系统,目前在画饼状态
- 修老朱然bug,现在可以在cleaner环节胆守
- 修卢弈死了手谈不消失(UI)
- 修重连时丢失房主信息
2023-10-07 23:00:25 +08:00
notify
f97df65ac6
Enhancement (#274)
- 修复录像负数时间bug
- 修复域名无法读取服务器信息bug
- 加入服务器界面的UI稍微优化
- 大厅聊天的UI稍微优化
- 添加时机“出牌阶段空闲时间点开始时”,可以在此时设置一些提示性标记
- 修复请求处理协程只要遇到error直接炸服的bug
- 添加手牌选择器,能在手牌非常多时帮助玩家选卡
2023-10-03 00:19:12 +08:00
notify
fa458f6d54 fix android 2023-08-27 21:54:25 +08:00
notify
17f981f135 Changelog: v0.3.7 2023-08-27 21:37:32 +08:00
notify
db2910d1f0
Chkout (#260)
修一堆小bug
2023-08-27 20:21:37 +08:00
notify
0a57727b39
pic mark (#248)
图片标记
2023-08-13 01:39:45 +08:00
notify
00578c2ad3
Bugfix (#244) 2023-08-12 00:50:17 +08:00
notify
a82b8c1b0a
Nfeature (#243)
- 15秒后其他人可以将房主踢出
- event中的从room.lua复制过来的self都规范成room
- 删了feasible的deprecate警告
- 虚空印卡

关于虚空印卡的说明:
* 印的卡id为负数,但依然属于实体卡。
* 这也就是说今后判断虚拟牌的依据是id == 0而不是 <= 0。
* 不过其实虚拟牌的id自古以来就固定是0啦,所以不用担心。
* 虚空印的卡自然只和当前运行的房间有关。
* 虚空印卡的id从-2开始,每印一张其id便减少1。
* 之所以不从-1开始是因为UI把-1认定为未知牌。Bot的玩家id也从-2开始,这是一个道理。
* 除此之外,印出的卡就如同一张普通的实体卡一样,洗入牌堆啥的都没问题,用来作其他虚拟卡的子卡也没啥问题。
* 坐等后面测试出bug吧,当然我希望直接不出bug。
2023-08-11 03:19:59 +08:00
notify
0745863863
Heg (#242)
- 游戏结束时离线玩家增加逃率
- 退出房间时取消准备状态
- 副技能的 `main_skill`
- 预亮相关优化
- 自定义身份,图从拓展包随便找一张
- 无懈可击使用时带1200毫秒延迟
- 未开始的房间显示开启的所有牌堆,衍生牌灰色字体化
- 可以随意打开fk.rep文件并播放录像
- 服务器Shell新增重置密码命令
2023-08-09 22:25:15 +08:00
notify
7fb5f7bb14
Qml (#238)
修复了qml的一些问题;增加利好私服的服主配置项。

---------

Co-authored-by: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
2023-08-03 15:24:17 +08:00
notify
cc0228dc03
Dev (#233)
- 以不存在的游戏模式开房时,自动替换成身份局
- 烧条满3管直接踢
- 游戏结束时掉线玩家(可能故意杀后台逃跑的)会受到逃跑惩罚
- 修git闪退的bug
- 关于页面补全作者信息
- 增加重载配置文件的shell命令
- 禁将方案切换
2023-08-02 21:40:00 +08:00
notify
59c25c583c
Replay (#231)
录像保存. 重放.
2023-08-01 21:01:01 +08:00
notify
1fcd63ddeb
Modmaker (#230)
今天的积木就搭到这里吧
MOD Maker道阻且跻啊
2023-08-01 11:39:54 +08:00