Commit Graph

47 Commits

Author SHA1 Message Date
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
Ho-spair
29fdfca9bb
Modify combo box (#140)
Co-authored-by: notify <notify-ctrl@qq.com>
2023-04-30 00:52:39 +08:00
notify
432bd5df4d volume cfg 2023-04-28 18:24:31 +08:00
notify
930826e664
Fixbug (#139)
修复了无法聊天
修复拼点没赢时双方都没赢
修复了被拼点的人无法选牌(或许吧
2023-04-28 10:27:56 +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
221cc552c7 ChangeLog: v0.1.2 2023-04-20 18:15:18 +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
0e51614588
Observer chat (#125)
新增旁观者聊天栏兼公告栏
增加服务端广播消息功能
修复单机启动失败时被心跳包卡死机的情况
修复发配音时undefined
聊天信息服务端回显
2023-04-18 23:26:15 +08:00
notify
9ae119028c
Enhancement (#116)
给Card堆一个伤害牌属性
能添加虚拟牌为子卡
封装了“视为使用xx牌”的函数
护甲机制
interaction现在可以作为一个函数,以实现动态化
冰属性伤害
使用牌堆中的牌不再报错
2023-04-13 20:17:39 +08:00
notify
b4f6e58f07
Chat (#112)
增加聊天功能
修bug
2023-04-10 21:34:23 +08:00
notify
9a951fdbfe
Spdx license (#109)
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
notify
a51806f902
Fixbug2 (#107)
修了窃听移走装备不失去装备技能
询问无懈时减少CPU使用
将skill.interaction的数据传到服务器
自动清除诸如-round结尾的标记
增加了和 轮次流程 相关的游戏流程与时机
2023-04-08 20:45:55 +08:00
notify
f1820bb07b
Lobby chat (#103)
大厅聊天
心跳包
服务端控制台踢人
2023-04-05 15:13:58 +08:00
notify
09dd59bebf
Extra interaction (#100)
为主动技/视为技提供了自定义额外交互的能力
可以在交互时候进行额外的UI操作
以及提供了一个UI组件,总之参考谋徐盛
2023-04-05 00:49:54 +08:00
notify
64f095d98f
Prompt (#97)
给好几个交互加个cancelable/prompt参数
把prompt美化了一下
2023-04-04 15:59:21 +08:00
notify
44c932981b fix chain bug 2023-03-20 20:28:25 +08:00
notify
16b6800811
New cards (#84)
火攻
铁锁重铸
2023-03-20 20:15:24 +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
3e78466947
Interaction (#61)
* AG (WIP)

* fixbug: setemotion in windows

* room:askForCardsChosen

* fixbug: askForCardChosen
2023-03-01 21:41:16 +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
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
Ho-spair
2f9f13f74b common tricks completed (#35)
* common tricks completed

* fix muti-targets tricks
2022-12-20 21:15:49 +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
5628e67a78 UI-adjust-1 (#20)
* better general card item

* translation for UI

* optimize size of general card PNGs

* make overviews 'singleton' (only create once)

* background, small bug fix

* init & lobby's roomlist

* gitignore for win deploy, fonts
2022-05-01 18:37:13 +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
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
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
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
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