Austin/FreeKill
1
0
Fork 0
mirror of https://github.com/Qsgs-Fans/FreeKill.git synced 2024-11-16 03:32:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
394 Commits 3 Branches 69 Tags 70 MiB
4d94ee8a93
Commit Graph

219 Commits

Author SHA1 Message Date
YoumuKon
623007aca2
DetailComboBox等各种功能+bug fix (#192) 
- 当你可用的武将数<玩家数*选将框数时发出警告(新禁/解禁(将/包)请退出重进)
- 修复人均克己的bug
- 修复帷幕能被挂闪的bug
- 为杀新增各种判定
- 添加AOE条件以修复无目标AOE的bug
- 延后Fk.currentResponsePattern = nil的时机，使视为技可以视为Fk.currentResponsePattern
- 主动技可以传更详细的ComboBox，谋徐盛现在会教你普通锦囊牌的用法
- 为防bug，由单挑王顶替小霸王的候补位
- 武将一览中没有翻译表的台词将设为空
- 新增exclusive_targets，可限定使用牌的目标(优先级高于一切目标筛选)
 2023-06-15 21:19:57 +08:00
YoumuKon
7ef427d7ef
死亡音效查询修复+各种功能+i18n (#191) 
- 迁移了死亡音效判定防止bug
- 牌种类/部分常见用语i18n
- 在线人数<10时会播放之前的登录/退出/重连信息
- askfordiscard禁止编辑已传入的maxNum/minNum
- getSuitString可以返回符号
- 添加getSuitCompletedString，可显示完整的**花色+点数**的完整点数
 2023-06-14 13:40:50 +08:00
YoumuKon
8a11690de7
无用空表Util.DummyTable化+若干bug fix+若干调整 (#189) 
- 将一些作为替代选项的空表替换为Util.DummyTable
- 修复了控制失效bug
- 修复了askForCards的bug
- 为弃牌阶段弃牌禁止取消
- 谋徐盛血量变为100
- setMark追加count为0时设为nil的设定
- 各种国际化
- 观星盒追加旁边的牌堆名
 2023-06-11 16:22:11 +08:00
Ho-spair
b2a963739b
Fix invalidity skill (#190) 
- 修复技能失效技；
- 新增全局技能以令非锁定技失效仅使用标记即可实现。
 2023-06-11 12:45:12 +08:00
YoumuKon
89c4f04db4
距离显示+无指示线属性 (#186) 
- 修改了距离显示的限制，现在可以显示玩家与自己之间0距离
- 为askForUseActiveSkill添加了是否取消指示线的参数
 2023-06-10 23:51:09 +08:00
xxyheaven
d3aed7242a
fix bug (#187) 
fix GameEvent:searchEvents
 2023-06-10 20:54:48 +08:00
notify
7f718503bd
Misc (#184) 
- 复活角色
- 将cancelable全改为默认true
- move私有牌堆的未知牌时不再显示错误
- 处理区牌增加大多数脚注
- 装备栏有宝物时压缩间距
- 使用虚拟牌时处理区有虚拟名字
- 带详细描述的选择框
- 武将一览界面显示技能语音、胜利语音、死亡语音
 2023-06-10 02:18:51 +08:00
YoumuKon
1556da2f13
QML修改+bugfix (#181) 
*因为一些原因，带动了之前的内容*

- 将QML的大多数let改成了const
- 修复一些bug
 2023-06-09 17:23:02 +08:00
notify
713bbca17a
Recorder (#178) 
提供了一个简单的事件记录器机制和一个功能简单的查询函数。
在GameEvent的clear环节中，先执行默认的clear函数，再执行用户自订的clear函数。
 2023-06-09 01:10:16 +08:00
YoumuKon
73fcb765d4
交换牌堆 (#175) 
……实际测试还没做完，但……大概可以了？
 2023-06-07 13:02:53 +08:00
Ho-spair
5ad2f870d5
fix bugs (#171) 2023-06-04 19:40:14 +08:00
Nyutanislavsky
23762e1600
Enhancement (#170) 
1. 手牌上限显示：体力值为负数和手牌上限为无限时显示优化
2. 观星新增提示，修复观星
3. 增加不计入手牌上限技
4. 修复变更武将
5. 修复奸雄和救援
6. 修复选角色的cancelble
7. 增强谋徐盛

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
 2023-06-04 19:39:20 +08:00
notify
9519d1b9a7
Misc (#169) 
- 扣上限心碎
- 进服维护的各种跟后端稳定性有关的代码
- 断线重连/旁观时候计入技能次数
- ban人和banip，相应的也有解禁
- 开房设置现在可以滑动
- 完善网络错误报错
- 现在开始游戏之前需要等待和所有人准备
- 指示掉线之人和走小道之人
- 掉线和走小道的人不再被AI接管
- 延时锦囊牌素材从拓展包找
- 拓展包管理界面UI优化，下载失败的包可以在管理拓展包中删除
 2023-06-04 19:31:44 +08:00
Ho-spair
5128100083
modify process & quest skill (#166) 2023-05-28 18:45:54 +08:00
notify
48f3ae3ecd
ModMaker start (#163) 
做了个Mod制作器的壳
修手气卡bug
修旁观/重连看不到标记
优化Card元表实现
 2023-05-26 20:53:26 +08:00
Ho-spair
1c6304f0f7
UI modify (#158) 
- 实现移动场上一张牌；
- 实现用作记录牌名并可查看的mark；
- 将askForChoice和interaction的文本解析方式改为prompt；
- 新增属性将牌移至牌堆指定索引位置；
- 修改时机“游戏开始时”至正确位置；
- 优化衍生牌逻辑；
- 新增“卡牌展示后”时机。
 2023-05-20 16:00:03 +08:00
notify
c222728a98
Vs (#157) 
askForUseViewAsSkill
送花砸蛋
 2023-05-19 23:03:39 +08:00
notify
ead6de967f
Miscfix (#156) 
- 在md5计算中将qml文件夹改名为Fk
- 修复了Linux每次启动都复制文件
- 修复单机游戏刷手气卡时走小道会卡死
- 服主退出大厅时会关闭服务器（伪热更新）
- 修复重连/旁观时武将名不显示
 2023-05-19 16:23:24 +08:00
notify
ce2cae0aa5
Qmlfix (#152) 
- 战报自动滚动
- 长按手牌显示提示
- 选将阶段可查看技能
- 减小延时锦囊的尺寸
- 在转圈界面显示提示文本
- 手气卡机制
 2023-05-19 07:45:21 +08:00
Ho-spair
6e2687a3ab modify functions 2023-05-13 15:03:35 +08:00
notify
5843442f98
Win rate (#149) 
胜率（无UI）
 2023-05-13 14:45:23 +08:00
Ho-spair
0033cd6c07
ban generals (#146) 
- 禁将功能
- 公告展示
 2023-05-13 14:20:48 +08:00
Ho-spair
a7e3ad0f19
Switch skill (#148) 
- 实现转换技；
- 将特殊的标记名称注册在mark_enum.lua文件；
- 标记值在UI的显示支持解析数组；
- 将觉醒技的觉醒条件分离至canWake函数；
- 修复一系列bug；
- 在Room类新增从牌堆、弃牌堆中随机获取牌的方法。
 2023-05-13 14:20:34 +08:00
RalphRad
5e9505d18e
LogEdit, Card.Void, aux_skills (#147) 
Card.Void, aux_skills, move card reason, clone card attackrange
 2023-05-13 14:16:09 +08:00
Nyutanislavsky
8d87fbbf09
Fixbug (#144) 
视为技添加frequency（为了显示限定技）
修复主动技canUse (by @Ho-spair )
Exppattern增加子类别
增加体力上限相关的log
增加求桃prompt
修复许褚、夏侯惇(by @xxyheaven )和赵云
移除观星一张牌直接放在牌堆顶
添加获得牌的log（和摸牌区分开）
封装重铸（和以技能重铸）函数

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
 2023-05-13 13:23:18 +08:00
Ho-spair
19a2cc5ed7
Initial kingdom choosing (#143) 
- 实现副势力概念，用于应对双势力机制；
- 完善神将及拥有副势力的武将开局选择势力的机制；
- 完成势力技概念；
- 实现ViewAsSkill在响应时对使用和打出的区分。

---------

Co-authored-by: notify <notify-ctrl@qq.com>
 2023-04-30 18:55:59 +08:00
notify
3dfff72836
新功能 (#141) 
增加最大选将18
将退出房改为延迟按钮
修虚拟闪电bug
修看破bug
增加长度限制
将异步模块单独一个Lua
 2023-04-30 18:51:05 +08:00
notify
930826e664
Fixbug (#139) 
修复了无法聊天
修复拼点没赢时双方都没赢
修复了被拼点的人无法选牌（或许吧
 2023-04-28 10:27:56 +08:00
notify
8d2230766d ChangeLog: v0.1.5 2023-04-27 14:20:28 +08:00
notify
fc8be0ad40
神貂蝉 (#138) 
控制他人/一控多相关
 2023-04-27 14:15:08 +08:00
Nyutanislavsky
b50c94d171
Fixbug (#137) 
将DamageFinished承载者改为受到伤害的角色（解决无来源伤害无法传导的bug）
bury加入重置武将牌
改进火攻的交互
更改八卦阵的pattern（解决AskForUseCard和AskForResponseCard的pattern为任意时八卦阵可以响应的bug）

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
 2023-04-26 09:40:51 +08:00
YoumuKon
754bd24794
观星扩展限制参数 (#135) 
已知Bug：~~初始化时，若牌堆顶牌位不足，剩余的牌在图像上会置于牌堆顶位置而不是牌堆底。挪动一次牌后恢复正常~~
更新：已修复
 2023-04-25 19:02:17 +08:00
notify
a09023c487
Heg (#134) 
国战雏形
 2023-04-23 21:10:07 +08:00
notify
5888df6e7c
Zhuran (#133) 
老朱然相关：终止结算、终止回合
执行新阶段
 2023-04-22 15:52:26 +08:00
notify
7e8b798c05
Gameflow (#132) 
修复trigger的优先级bug
修复回合事件
 2023-04-22 14:10:06 +08:00
deepskybird
d763929544
card_mark (#124) 
试着增加了card_mark，如果顺利希望后续能在前端对@和@@整特效
例如@@开头的就是那种只有特定文字写在卡牌下方的标记牌

有个展望是和playermark类似，后续根据进入弃牌堆/进入其他区域/进入其他玩家手里决定是否删除对应mark。

同时本版本存在standard_card对AOE的一些修改，不过N神你之前要的那个恕我菜菜，合不起来···
 2023-04-21 22:49:49 +08:00
notify
1b8447acbe
Fixbug (#128) 
修倾国再点一下技能按钮会直接视为被取消
修服务端Log没有日期
修房间右上角没有轮数、对局时长、牌堆剩余牌数
修Linux上Log没有彩色字体
修短标记也会占用整整一行显示
修只有一张子卡的虚拟牌是无花色
修无花色牌不在牌面显示颜色
 2023-04-20 00:19:48 +08:00
notify
85923c8a71
Deputy general (#127) 
增加双将机制
 2023-04-19 14:07:16 +08:00
notify
ce09673dcc ChangeLog: v0.1.0 2023-04-15 12:40:07 +08:00
Ho-spair
4d0d0c1d60
base lord skills (#119) 
主公技
 2023-04-15 12:06:24 +08:00
notify
9ae119028c
Enhancement (#116) 
给Card堆一个伤害牌属性
能添加虚拟牌为子卡
封装了“视为使用xx牌”的函数
护甲机制
interaction现在可以作为一个函数，以实现动态化
冰属性伤害
使用牌堆中的牌不再报错
 2023-04-13 20:17:39 +08:00
notify
a735013411
Fixbug (#115) 
修流离锁定技
修斧子弃自己
修顺手空城卡死
修旁观者id是自己的
修旁观者再开新局就闪退（或许吧）
修拼点报nil
修询问无懈时旁观者被卡在外面
修Room的请求队列不清理干净
 2023-04-12 22:28:19 +08:00
notify
28436eb9d4
Comment (#114) 
翻译注释/加注释
 2023-04-12 20:51:09 +08:00
notify
b4f6e58f07
Chat (#112) 
增加聊天功能
修bug
 2023-04-10 21:34:23 +08:00
notify
533cc1a464
Card limitation (#111) 
禁止使用打出弃置
Fk.currentResponseReason
FilterSkill加player参数
 2023-04-10 15:55:06 +08:00
notify
9a951fdbfe
Spdx license (#109) 
在所有代码中添加了许可证标记头
 2023-04-09 13:35:35 +08:00
notify
b0c2855389
Enhancement (#108) 
优化拖曳
牌局查看技能
狮子不给死人加血
GameEvent相关函数
觉醒技默认cost和锁定技一样
 2023-04-09 11:44:19 +08:00
notify
a51806f902
Fixbug2 (#107) 
修了窃听移走装备不失去装备技能
询问无懈时减少CPU使用
将skill.interaction的数据传到服务器
自动清除诸如-round结尾的标记
增加了和 轮次流程 相关的游戏流程与时机
 2023-04-08 20:45:55 +08:00
notify
ed70e54cff
Fix syntax error in room.lua 2023-04-08 09:43:59 +08:00
notify
c962f71c8f
Fixbug (#104) 
修了觉醒技图标显示反的bug
修了流离报错bug

---------

Co-authored-by: RalphRad <121930519+RalphRad@users.noreply.github.com>
 2023-04-08 09:32:51 +08:00
notify
46176e2477
Fixbug (#102) 
修复了势力没有实际赋值给Player的bug
修复了装备牌图标的存放位置
增加了mod中拓展势力的支持（其实就是加载图的位置罢了）
 2023-04-05 02:21:59 +08:00
notify
4833d202b1
Wake limit (#101) 
显示限定技标记的UI。
原理上也能显示觉醒技，我也做了显示觉醒技，但没测试。
转换技、使命技也是这样显示的，但先不提就是了，先合一发
 2023-04-05 01:05:06 +08:00
notify
2e37b46234
Modify process & UI component (#98) 
耦老周泰
点牌堆弹出牌

---------

Co-authored-by: Ho-spair <linyuy@163.com>
 2023-04-04 16:25:37 +08:00
notify
64f095d98f
Prompt (#97) 
给好几个交互加个cancelable/prompt参数
把prompt美化了一下
 2023-04-04 15:59:21 +08:00
notify
e4c806ff09
Doc2 (#90) 
又写了一堆文档呢（乐

---------

Co-authored-by: deepskybird <32931830+deepskybird@users.noreply.github.com>
 2023-03-29 23:27:11 +08:00
notify
a1ae83c562
Sphinx doc (#86) 
将文档系统改成Sphinx，并增加了新CI
 2023-03-26 17:32:45 +08:00
Ho-spair
dfe3e8b2e7
Qing gang sword & zhu que fan (#85) 
- 完成【青釭剑】效果
- 初步完成技能失效技
- 完成【朱雀羽扇】
- 修改“连环状态”传导逻辑
- 修改八卦阵匹配的pattern
 2023-03-20 20:49:23 +08:00
notify
16b6800811
New cards (#84) 
火攻
铁锁重铸
 2023-03-20 20:15:24 +08:00
notify
139464be14
UI (#83) 
重写登陆界面UI和大厅UI
加入玩法一览界面
加入开屏动画
修bug
 2023-03-20 14:53:56 +08:00
notify
496598623d update kingdom 2023-03-19 00:15:12 +08:00
notify
fcddd36a6d
Fix more bug (#81) 
修更多的bug，哪来那么多bug啊
 2023-03-18 23:37:21 +08:00
notify
fd1a1ce5fd
Fixbug (#79) 
修一大堆bug
 2023-03-18 15:34:42 +08:00
Ho-spair
4ab14c7d74
Pindian&analeptic (#77) 
Co-authored-by: notify <notify-ctrl@qq.com>
 2023-03-14 20:48:08 +08:00
notify
9b185c439d
Custom Packages When Creating Room (#76) 
添加了创建房间时自选拓展包的功能
 2023-03-14 14:12:13 +08:00
notify
5f8a06e7df change gamerule's logic to function 2023-03-14 01:21:09 +08:00
notify
6ae86a1e3e
Gamemode (#75) 
提供拓展游戏模式的接口
 2023-03-14 00:12:02 +08:00
notify
694deecdf1
Fixbug (#74) 
- 修复ak和咆哮失效
- 修复服务端调viewAs的时候缺个Self
- 修复不能显示数字型标记
- 新函数player:gainAnExtraTurn，可用来进行额外回合
 2023-03-13 20:51:12 +08:00
notify
590af8cb14
Maneuvering (#72) 
军争包还差火攻、酒、朱雀羽扇没做
铁索还没法重铸
除此之外还行
 2023-03-09 12:19:16 +08:00
notify
5488469ad6
Event (#70) 
将执行回合和摸初始牌作为了“事件”
同时为事件添加了自定义清理函数（未经测试
 2023-03-07 14:55:28 +08:00
notify
861d87849a
Fixbug (#69) 
修了很多bug 但我自己都不确定是不是修了
 2023-03-07 10:21:56 +08:00
Ho-spair
932914c62c
bagua and wushuang (#65) 
* bagua and wushuang

* delete space
 2023-03-06 01:07:54 +08:00
notify
79389d9444
Expand pile (#62) 
* fixbug: handcards in PlayerCardBox

* fix lightning

* fix translation

* gamelogic:getcurrentevent

* exppattern and pile

* complete pile
 2023-03-05 01:28:59 +08:00
notify
3e78466947
Interaction (#61) 
* AG (WIP)

* fixbug: setemotion in windows

* room:askForCardsChosen

* fixbug: askForCardChosen
 2023-03-01 21:41:16 +08:00
notify
3f077a6d69
Rewrite event (#60) 
* doc for gameevent

* init game event

* correct other yield call

* hp event

* dying event

* move card event

* use/response event

* judge event

* remove space
 2023-03-01 01:43:44 +08:00
notify
a579cf2a59 Ci: check space and LF (#55) 2023-02-26 16:51:29 +08:00
notify
9ac89caa1f Random AI (#54) 
* android: dont copy RSA key and test.lua(generated by fkp)

* remove debug code

* ai think

* fixbug: 100% cpu per thread

* init ai

* fix bug, next step is to remove all feasible

* remame vscode -> lsp

* add some lsp comment

* rewrite feasible

* Random AI

* fixbug: chooseplayer

* liuli

* move checkNoHuman to waitForAiReply

* prototype for cardLimitation skill

* add Exppattern:Parse to static.lua

* remove unnecessary static
 2023-02-26 15:01:14 +08:00
notify
afb537a661 Merge 'standard' (#53) 
* todo

* todo.md

* doc for move cards

* weapons excluding qinggang

* equip sound and emotion

* remove silence on the starting of using skill

* add audio skill for TMD equip

* fixbug: running and observing

* when PreUseCard is broken, jump to move cards to discardPile

* doc for diy

* addToPile

* viewPile (WIP)

* fix git bug

* auto update packages when md5 fail

* use thread when updating pack

* correct status() handling

* update fkp

* remove PKGBUILD since it's presented in AUR repo

* fix fkp md5 bug

* extensible qml

* set bigAnim's z to 999

* nioh sheild

* lijian

* now mod can return nil

* if dmg.nature == nil then = normal

* disable notifyUI when qWarning

* fix lijian and gender problem
 2023-02-21 13:44:24 +08:00
notify
b2dfd69a16 Fixbug (#51) 
* add translation for askforguanxing

* fix bug: observer will kill room that not take action

* fix bug: observe and reconnect

* fix bug: notifyCardMove

* fix bug: hegmony nullification

* fix bug: never show test generals in normal askforgeneral

* if game doesn't start, marshal() will only send simple information
 2023-02-16 00:54:39 +08:00
Ho-spair
3fe92b4344 standard equip skills (#49) 
* install and uninstall equip skill

* complete pr; filter skill viewAs equip

---------

Co-authored-by: notify <notify-ctrl@qq.com>
 2023-02-15 21:20:40 +08:00
notify
cc271bcdf8 Standard equips (#50) 
* support fkp

* get default setting in qml

* correct zixing

* mark

* TODO: parse fkp in c++

* scale the drawer

* free assign

* fix free assign bug

* add submodule for official generals

* generate fkp in cpp code

* use UTF-8 in windows conhost

* use onUse for regular skill

* active skill for fkp

* add fkp function; change data for DMG and Heal

* add cancelable to askForDiscard

* don't let generals naked

* config bg and bgm

* fix exists for win

* bugfix: rewardandpunish

* fkp: vs skill

* room config

* observe

* god_salavation

* fkp: judge

* add read storage permission for android build

* remove submodule fk_official

* remove include/

* use a submodule as include directory

* libgit2

* remove debugging 'downloadNewPack'

* libgit2.dll for Windows

* rewrite system_enum, disable dangerous function

* fix bug in trigger()

* filter skill

* filter judgement card

* add about page for git2

* very basic general detail

* FKP: status skill

* libgit: android test

* libgit: build for android

* 1

* libgit2.dll

* android: load qm file after copy asset

* filter skill: if no filter skill then remove filtered card

* allow warning and critical to show a popup, and fix warnings from QML

* resource: move general audio/image to packages/

* move assets of cards

* FKP: modify

* use sqlite db to manage packages

* packman cli

* packman gui

* use Popup for error dialog

* android full screen note

* fix android ssl problem
 2023-02-15 19:54:35 +08:00
notify
c6d883eccf Standard skills (#48) 
* huatuo

* biyue

* gender of player

* let tablepile smaller

* card emotions

* remove getOtherPlayers

* guicai

* skill audio

* card audio

* death audio

* bgm

* damage sound

* local bgm

* add more skill audio

* android: dont link to quickcontrol2

* android: fix ifndef

* yield only when need

* modify cpp according to clazy

* reduce malloc times

* revert yield

* qingguo

* fix back to lobby

* use compact json in cpp

* notifySkillInvoke animation

* util: string2json

* losehp; tablepile fix

* judge result animation

* add scrollbar for logedit

* add lock on waitForReply

* fix: virtual jink has no effect

* tiandu

* fix: duplicated cards when related to equiparea

* ui: disable okcancel when replying

* ui: disable invaild card when responding

* game: skill & card use history

* game: more judge on vsskill's canUse

* luoyi

* login page i18n

* i18n for server error message

* tuxi

* expand equip area when needed

* add footnote to cards from pile

* ui: only filter CanUseCard when playing

* expand equip when responding

* prompt

* prompt for askforchoice

* guanxing

* fix guanxing

* tieqi

* liuli

* doc for trigger skill

* xiaoji

* lianying

* fanjian

* rende

* add skill's subclass

* TODO: add tmd skill functions for other cards

* paoxiao

* qicai

* guose

* yiji (WIP)
 2023-01-29 18:11:41 +08:00
notify
fd072ca0b4 Status skill and some skills (#47) 
* prototype for 3 status skills

* maxcards skill

* attack range skill

* prohibit skill

* kongcheng

* use general's skill instead of default

* skills
 2023-01-22 00:49:11 +08:00
notify
a8cd7431ef Reconnect (#46) 
* 1

* room:delay and other coroutine

* yield in waitForReply

* fix stack overflow bug

* compress large message when transmiting

* delete useless func

* reconnect

* update doc for reconnect
 2023-01-17 22:34:15 +08:00
Ho-spair
1dd9abda14 remove second getOtherPlayers() (#43) 2023-01-16 19:14:14 +08:00
notify
b6530eae9d Vs skill (#44) 
* vs skill concept

* unify card:clone

* virtual card

* wusheng

* exppattern

* use virtual card(WIP)

* change cardId to card

* virtual card log

* notify skill invoked

* fix coroutine bug; allow vsskill to response

* extra_data for askForUseCard

Co-authored-by: Ho-spair <linyuy@163.com>
 2023-01-16 19:13:07 +08:00
jazuo
f34079e6c3 jieyin 
jieyin and set gender
 2023-01-09 19:15:18 +08:00
jazuo
6121f7d66b kurou 2023-01-08 14:57:42 +08:00
notify
9f3c17b405 fix bug 2023-01-07 15:34:52 +08:00
jazuo
fcb6ce89a4 fankui 
fankui and fix some bugs
 2023-01-07 15:20:44 +08:00
notify
509cf29175 Distance skill (#37) 
* global distance skill

* normal distance skill

* remove addGeneral from init.lua

* fixed distance
 2023-01-04 14:21:29 +08:00
Ho-spair
f434e9ee9b prevent enter dying loop 2022-12-20 21:32:38 +08:00
Ho-spair
2f9f13f74b common tricks completed (#35) 
* common tricks completed

* fix muti-targets tricks
 2022-12-20 21:15:49 +08:00
notify
dfa88df214 Delaytrick (#34) 
* skip phase (not tested)

* Keep alive

* fix peach

* update

* fix move card

* indulgence

* lightning

* complete skip phase
 2022-12-20 18:40:17 +08:00
notify
0029949a40 Basiccard (#33) 
* update nullification

* Slash

* kill player

* correct players to alive_players

* add log for changehp and dying

* usecard log & indicator

* setemotion, logevent

* fix distanceTo

* shutdown server when console start

* game over

* complete slash

* change format of flist.txt to avoid '\r\n'

* fix \r\n

* peach, zhiheng

* ask for peach
 2022-12-20 12:51:54 +08:00
notify
22235ee6ec Jink&null (#32) 
* rewrite toUtf8().data()

* jink, askforuse, askforresp

* nullification
 2022-12-18 21:19:35 +08:00
notify
a02410c282 Merge Dev (#31) 
* splash screen when app is loading

* doRaceRequest

* prepare to add fkparse feature

* player mark operation

* dont call lua in regular room

* dont call lua in lobby

* clean up

* idle_room in Cpp's class Server

* fix many small bugs

* Security enhancement (#27)

* use RSA encryption when sending password

* update fkp's url so other can clone it

* add salt to password

* save password

* fix default config bug

* fix room reuse bug

* disable empty usr name

* how to compile (#28)

* add some doc

* how to compile

* update readme

* Actions (#29)

* judge(not tested)

* logic of chat

* sendlog at most scenario

* adjust ui, add shortcuts

* ui, z axis of cardArea

* create server cli, improve logging

* basic shell using

* use gnu readline instead

* use static QRegularExp

* fix android build

* fix automoc problem

* MD5 check

* md5 check bugfix

* cardEffectEvent (#30)

* cardEffectEvent

* add TODOs

* thinking

Co-authored-by: Ho-spair <62695577+Ho-spair@users.noreply.github.com>
 2022-12-18 12:52:52 +08:00
notify
7b12d82683 askForUseActiveSkill (#26) 
* askForUseActiveSkill (not tested)

* askForDiscard

* askForChoosePlayers (not tested)

* add comment, update readme
 2022-09-15 11:17:13 +08:00
notify
162b3af505 Use skill (#25) 
* distance & snatch

* distance & snatch - clean

* fix: client.alive_players

* room:askForCardChosen(todo: snatch)

* add skill to players(uncomplete)

* ui of skill btn

* expand pile(not completed)

* Use card2 (#23)

* snatch (todo: owner_map)

* owner_map

* remove too many snatch

* update

* call active skill's functions

* use zhiheng

* Qt6 (#24)

* use qt6

* android compiling

* remove version number of qml import

* correct anti-sql injection; update deprecated code

* add fkparse as submodule

* link fkparse, and write simple functions

* adjust ui

* adjust layout for photos; fix qml warning

* android problem fix (partially)

* move ico

* update copy_assets

* update logic for ok/cancel btn
 2022-09-14 13:01:10 +08:00
notify
60b9839fd7 Disable sync (#21) 
* fix running from running room

* fix: ~serverplayer()

* since room player's id won't change anymore, don't use :getId()

* we won't access lua from other thread, so drop the mutex

* bugfix
 2022-05-02 14:00:47 +08:00
notify
dedde94643
Use card (#19) 
* the process of using card (uncompleted)

* code style: tab is 2 spaces(not \t or 4 space)

* update lua54.dll to MinGW version(no cygwin1.dll required)

* basic ui logic

* ActiveSkill

* modidy ActiveSkill defaults

* todo: defaultEquipSkill

* client

* send use card to server

* playing phase, equip

Co-authored-by: Ho-spair <linyuy@163.com>
 2022-04-30 15:27:56 +08:00
notify
af4924c260
UI commands (#17) 
* add cardarea

* move cards

* add util

* delaytrick

* equiparea

* var -> let

* photo loop anim

* setEmotion & damage

* photo status

* doIndicate

* add property to ClientPlayer

* todo: movecards, waiting

* handle moveCards at client

* ui - moveCards

* modify to lua

* move visible

* adjust position of tablepile

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-14 18:22:00 +08:00
Ho-spair
09e34cfef6
Gamecore 2 (#16) 
* upgrade gamecore

* [Funtion] Room:moveCards() completed

* add some functions in Room

* fixup

* delete wrong files
 2022-04-08 18:39:58 +08:00
notify
8b212c2a7a
player:play (#15) 
* player:play

* proceed phase

* update readme

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-04 19:04:55 +08:00
Notify-ctrl
9e09e6e50d
Todo: disable sync (#14) 
* lock room lua

* fixme

* add 'id' to lua Player

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-03 21:43:35 +08:00
Notify-ctrl
4c93c897b2
Trust ai (#13) 
* add 'Robot' to Player::State

* add definition to Room::addRobot

* addRobot

* modify room abandon

* robot will wait for 1 second(not 1000)

* tell lua and js someone run

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-03 06:41:55 +08:00
Notify-ctrl
927c5f479b
gamerule:Turnstart (#12) 
* add tag to room

* add switch statement(util.lua)

* using emmylua

* gamerule(..)

* turnOver

* add many events

* stop the room when deleting

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-02 21:39:44 +08:00
Notify-ctrl
c230d675ce
Invoke choice (#10) 
* define askforskillinvoke

* states of room

* askForSkillInvoke

* askForChoice

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-02 15:11:13 +08:00
Notify-ctrl
4e25c032e6
Skill (#9) 
* TriggerSkill

* update type comment

* events of phases

* lua annotation

* change style of enums

* clear lua stack

* multi lua_State at server side

* disable addPlayer when room is full or started

* logic:trigger

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
 2022-04-01 20:51:01 +08:00
Notify-ctrl
957fefe881
Cards (#8) 
* more comment

* create standard card pack

* create card classes

* freekill -> fk

* fk_ex
 2022-03-31 13:29:23 +08:00
Notify-ctrl
a85f510c98 commit 2022-03-30 16:33:56 +08:00
Notify-ctrl
7fd127b849
Request (#7) 
* cli

* add timeout for class Room

* request func, roomowner

* request

* corrent stupid Qml/JS

* chooseGenerals

* prepareForStart(part 1)

* fix require grammar
 2022-03-30 14:14:40 +08:00
Notify-ctrl
58ea0ca80a
Role & Seat (#6) 
* standard generals

* assignrole

* arrangeSeat

* fix bugs
 2022-03-28 22:24:30 +08:00
Notify-ctrl
3e4080f2ad
edit profile (#5) 2022-03-27 20:00:29 +08:00
Notify-ctrl
a67175f8eb Room (#4) 
* Run room in lua

* handle offline player

* Better toast and other

* delete useless stuff

* todo: edit profile

* use pch
 2022-03-27 15:12:00 +08:00
Notify-ctrl
3dc95ebc49 Gamecore (#3) 
* create some class

* create some base classes

* fixup

Co-authored-by: Ho-spair <linyuy@163.com>
 2022-03-27 15:12:00 +08:00
Notify-ctrl
d2315c7533 Basic roomscene (#1) 
* create Photo

* Room layout, img, debug
 2022-03-27 15:12:00 +08:00
Notify-ctrl
8fb08a8ece changed code style, doc 2022-03-27 15:12:00 +08:00
Notify-ctrl
5f175090c0 Create and enter room 2022-03-27 15:12:00 +08:00
Notify-ctrl
6fb0158d39 Initial import 
commit

1

GPLv3

commit

commit

commit

commit

commit

commit
 2022-03-27 15:11:55 +08:00