Commit Graph

51 Commits

Author SHA1 Message Date
notify 59d1623dbd
ban words (#185)
禁用词汇表。。。
过滤ID、房间名、聊天信息。。
我做这个干啥呢
2023-06-10 11:35:45 +08:00
notify 9519d1b9a7
Misc (#169)
- 扣上限心碎
- 进服维护的各种跟后端稳定性有关的代码
- 断线重连/旁观时候计入技能次数
- ban人和banip,相应的也有解禁
- 开房设置现在可以滑动
- 完善网络错误报错
- 现在开始游戏之前需要等待和所有人准备
- 指示掉线之人和走小道之人
- 掉线和走小道的人不再被AI接管
- 延时锦囊牌素材从拓展包找
- 拓展包管理界面UI优化,下载失败的包可以在管理拓展包中删除
2023-06-04 19:31:44 +08:00
notify 9876becf2e
Modmaker (#165)
能增删新mod了,先就这样
2023-05-27 21:59:31 +08:00
notify beaaa09fbe
Password room (#164)
密码房
2023-05-27 21:58:32 +08:00
notify 48f3ae3ecd
ModMaker start (#163)
做了个Mod制作器的壳
修手气卡bug
修旁观/重连看不到标记
优化Card元表实现
2023-05-26 20:53:26 +08:00
notify ead6de967f
Miscfix (#156)
- 在md5计算中将qml文件夹改名为Fk
- 修复了Linux每次启动都复制文件
- 修复单机游戏刷手气卡时走小道会卡死
- 服主退出大厅时会关闭服务器(伪热更新)
- 修复重连/旁观时武将名不显示
2023-05-19 16:23:24 +08:00
notify 0d709d6a73
Cppfix (#153)
- 更新拓展包时增加更多的提示信息
- 增加版本检测系统,同时修改了安装AES密钥的时机
- 修复了偶发性的因进房导致的闪退(或许吧)
2023-05-19 07:45:36 +08:00
notify fc3a7dbda7
Remove fkp (#154)
删除fkparse模块
2023-05-19 07:45:08 +08:00
notify 5843442f98
Win rate (#149)
胜率(无UI)
2023-05-13 14:45:23 +08:00
notify 34ce4c9859
Cppfix (#142)
修了一些需要重新编译的bug

修大厅卡死尸体
修“已经有人登入”
修服务端翻译文件
增加出牌时间设置
修Linux下复制文件bug
再次尝试wasm
2023-04-30 18:54:23 +08:00
notify fc8be0ad40
神貂蝉 (#138)
控制他人/一控多相关
2023-04-27 14:15:08 +08:00
notify a09023c487
Heg (#134)
国战雏形
2023-04-23 21:10:07 +08:00
notify f488cc4b69 fix reconnect 2023-04-21 05:00:57 +08:00
notify 553022db14 greeting for login/logout 2023-04-20 15:06:52 +08:00
notify 85923c8a71
Deputy general (#127)
增加双将机制
2023-04-19 14:07:16 +08:00
notify 1ad352521f
init server config (#126)
为Linux加了彩字
为服务端加个读配置的接口——不过我暂时想不出服务端有啥好配置的
2023-04-19 11:06:19 +08:00
notify 0e51614588
Observer chat (#125)
新增旁观者聊天栏兼公告栏
增加服务端广播消息功能
修复单机启动失败时被心跳包卡死机的情况
修复发配音时undefined
聊天信息服务端回显
2023-04-18 23:26:15 +08:00
notify a65c3d8c85 Critical BUGFIX: md5 bug 2023-04-15 13:42:11 +08:00
notify dd6093a5ac
Aes (#118)
启用AES加密
同时考虑到低版本“记住密码”中缺少AES密钥的情况
2023-04-15 12:06: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 9a951fdbfe
Spdx license (#109)
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
notify 018cb249ab
Build ci (#105)
构建安卓版的CI
构建win版的CI(未完成)
以上均需要手动触发
2023-04-07 16:07:52 +08:00
notify f1820bb07b
Lobby chat (#103)
大厅聊天
心跳包
服务端控制台踢人
2023-04-05 15:13:58 +08:00
notify a579cf2a59 Ci: check space and LF (#55) 2023-02-26 16:51:29 +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 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 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
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 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 7da5fcfa2c fix: quit a started room block main thread 2022-08-03 19:13:27 +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-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 8637356a04
Read lua from client (#11)
* access lua from client

* todo:robot

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
2022-04-02 15:55:01 +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 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 3fb3570fa0 Remove property uid of serverplayer 2022-03-27 15:12:00 +08:00
Notify-ctrl 432a306de0 Add / Remove Player (#2)
* addplayer and removeplayer

* add sqlite3 library and remove comment in library headers

* setup database system
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 9ed3f1bf3f update room list 2022-03-27 15:12:00 +08:00
Notify-ctrl 5f175090c0 Create and enter room 2022-03-27 15:12:00 +08:00