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)
This commit is contained in:
notify 2023-01-29 18:11:41 +08:00 committed by GitHub
parent fd072ca0b4
commit c6d883eccf
412 changed files with 2234 additions and 335 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
# Compile output # Compile output
build/ build/
*.o *.o
zh_CN.qm
# IDE & LSP # IDE & LSP
.kdev4/ .kdev4/

View File

@ -14,6 +14,7 @@ find_package(Qt6 REQUIRED COMPONENTS
Network Network
Multimedia Multimedia
QuickControls2 QuickControls2
LinguistTools
) )
find_package(OpenSSL) find_package(OpenSSL)
@ -56,6 +57,10 @@ add_custom_command(
) )
qt_add_executable(FreeKill) qt_add_executable(FreeKill)
qt_add_translations(FreeKill
TS_FILES lang/zh_CN.ts
QM_FILES_OUTPUT_VARIABLE zh_CN.qm
)
if (${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") if (${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
file(GLOB_RECURSE FK_RESOURCE_FILES file(GLOB_RECURSE FK_RESOURCE_FILES

View File

@ -11,6 +11,7 @@ if [ ! -e assets/res ]; then
mkdir -p assets/res mkdir -p assets/res
fi fi
cp -r ../audio assets/res
cp -r ../fonts assets/res cp -r ../fonts assets/res
cp -r ../image assets/res cp -r ../image assets/res
cp -r ../lua assets/res cp -r ../lua assets/res
@ -19,6 +20,7 @@ cp -r ../qml assets/res
cp -r ../server assets/res cp -r ../server assets/res
rm assets/res/server/users.db rm assets/res/server/users.db
cp ../LICENSE assets/res cp ../LICENSE assets/res
cp ../zh_CN.qm assets/res
# Due to Qt Android's bug, we need make sure every directory has a subfile (not subdir) # Due to Qt Android's bug, we need make sure every directory has a subfile (not subdir)
function fixDir() { function fixDir() {

BIN
audio/card/common/armor.mp3 Normal file

Binary file not shown.

BIN
audio/card/common/horse.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/card/female/duel.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/card/female/jink.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/card/female/peach.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
audio/card/female/slash.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/card/male/duel.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/card/male/jink.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/card/male/peach.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
audio/card/male/slash.mp3 Normal file

Binary file not shown.

BIN
audio/card/male/snatch.mp3 Normal file

Binary file not shown.

BIN
audio/death/caocao.mp3 Normal file

Binary file not shown.

BIN
audio/death/daqiao.mp3 Normal file

Binary file not shown.

BIN
audio/death/diaochan.mp3 Normal file

Binary file not shown.

BIN
audio/death/ganning.mp3 Normal file

Binary file not shown.

BIN
audio/death/guanyu.mp3 Normal file

Binary file not shown.

BIN
audio/death/guojia.mp3 Normal file

Binary file not shown.

BIN
audio/death/huanggai.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
audio/death/huatuo.mp3 Normal file

Binary file not shown.

BIN
audio/death/liubei.mp3 Normal file

Binary file not shown.

BIN
audio/death/luxun.mp3 Normal file

Binary file not shown.

BIN
audio/death/lvbu.mp3 Normal file

Binary file not shown.

BIN
audio/death/lvmeng.mp3 Normal file

Binary file not shown.

BIN
audio/death/machao.mp3 Normal file

Binary file not shown.

BIN
audio/death/simayi.mp3 Normal file

Binary file not shown.

BIN
audio/death/sunquan.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
audio/death/xiahoudun.mp3 Normal file

Binary file not shown.

BIN
audio/death/xuchu.mp3 Normal file

Binary file not shown.

BIN
audio/death/zhangfei.mp3 Normal file

Binary file not shown.

BIN
audio/death/zhangliao.mp3 Normal file

Binary file not shown.

BIN
audio/death/zhaoyun.mp3 Normal file

Binary file not shown.

BIN
audio/death/zhenji.mp3 Normal file

Binary file not shown.

BIN
audio/death/zhouyu.mp3 Normal file

Binary file not shown.

BIN
audio/death/zhugeliang.mp3 Normal file

Binary file not shown.

BIN
audio/skill/biyue1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/biyue2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/fanjian1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/fanjian2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/fankui1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/fankui2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/ganglie1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/ganglie2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/guanxing1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/guanxing2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/guicai1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/guicai2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/guose1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/guose2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jianxiong1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jianxiong2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jieyin1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jieyin2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jijiu1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jijiu2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jizhi1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/jizhi2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/keji1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/keji2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/kongcheng1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/kongcheng2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/kurou1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/kurou2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/lianying1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/lianying2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/lijian1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/lijian2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/liuli1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/liuli2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/longdan1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/longdan2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/luoshen1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/luoshen2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/luoyi1.mp3 Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More