YunFeiyang
/
FreeKill
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
420 Commits 4 Branches 61 Tags 67 MiB
Commit Graph

29 Commits

Author SHA1 Message Date
YoumuKon a433b1a9ed
Dev bugfix (#344) 
- 实装了by_user用以检定“使用牌造成伤害”
- 实装Fk.lords以快速查找主公武将
- 添加moveMark以在移动后(前一刻)赋予标记
- 实装-inarea后缀，移动后若不在对应区域会被立即移除
- 为system_enum补全注释
- 内置神将映射
- 修复了小乔转酒杀导致二连击的bug
- 修复了askForCardsChosen烧条后不自动抓取的bug

---------

Co-authored-by: Nyutanislavsky <nyutanislavsky@qq.com>
 2024-04-19 21:35:29 +08:00
xxyheaven 873d68363c
fix bug (#337) 
1、给carditem增加dragging参数；
2、filterskill在mute的情况下不播放技能特效；
3、给ActiveSkill增加no_indicate参数
4、回合开始时、结束时这两个时机当前回合角色的phase设置为Player.None
5、给usecard增加noIndicate参数
 2024-04-07 00:21:15 +08:00
notify 7779f06411
Fixbug (#319) 
修bug... 虽然不知道是不是修了
修那个gameOver触发时机的
注意了休整下投降仍未修复哦
先放个PR在这了
 2024-02-17 09:47:17 +08:00
Nyutanislavsky d0913e42ce
Heg (#254) 
1. 修复木马、真名无懈可击
2. 增加亮将、暗将时机
3. 增加武将珠联璧合关系
4. 增加武将选择框禁止替换
5. 增加变换武将不改变体力上限
6. 增加亮将禁止、不计入距离和座次的MarkEnum，相应的player函数
7. 状态技默认锁定技
8. 修复拼点
9. 增加出牌阶段亮将技能
10. 增加暗置武将函数

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
 2023-08-24 21:37:06 +08:00
YoumuKon a812af8d97
bug fix和黑名单 (#223) 
- 修复了旁观skill出错的bug
- 为模式和扩展包提供相互之间的黑/白名单
 2023-07-14 22:17:54 +08:00
notify b75d8afe62
Scheduler (#194) 
简单协程调度器的实现，详细说明请看 docs/dev/scheduler.rst
 2023-06-16 10:56:33 +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
deepskybird 5a30c69085
player_doc更新 (#168) 
更新文档注释，还请各位查阅。

Co-authored-by: YWSC120 <111111@163.com>
 2023-06-03 23:59:04 +08:00
Ho-spair 5128100083
modify process & quest skill (#166) 2023-05-28 18:45:54 +08:00
Ho-spair a7e3ad0f19
Switch skill (#148) 
- 实现转换技；
- 将特殊的标记名称注册在mark_enum.lua文件；
- 标记值在UI的显示支持解析数组；
- 将觉醒技的觉醒条件分离至canWake函数；
- 修复一系列bug；
- 在Room类新增从牌堆、弃牌堆中随机获取牌的方法。
 2023-05-13 14:20:34 +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 a09023c487
Heg (#134) 
国战雏形
 2023-04-23 21:10:07 +08:00
notify f0212d54cf
Pattern (#129) 
为Pattern增加了否定语法
优化几个类的__tostring元方法
增加调试器第三方库，编写调试文档
 2023-04-21 04:29:52 +08:00
Ho-spair 4d0d0c1d60
base lord skills (#119) 
主公技
 2023-04-15 12:06:24 +08:00
Nyutanislavsky 13b77e4c36
Enhancement (#117) 
添加武将相关技能
添加武将中性和无性

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
 2023-04-13 22:01:25 +08:00
deepskybird 604e1d00b4
core_doc_20230412_0844 (#113) 
general/gamemode/skill更新

Co-authored-by: YWSC120 <111111@163.com>
 2023-04-12 13:28:01 +08:00
notify 9a951fdbfe
Spdx license (#109) 
在所有代码中添加了许可证标记头
 2023-04-09 13:35:35 +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 694deecdf1
Fixbug (#74) 
- 修复ak和咆哮失效
- 修复服务端调viewAs的时候缺个Self
- 修复不能显示数字型标记
- 新函数player:gainAnExtraTurn，可用来进行额外回合
 2023-03-13 20:51:12 +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 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 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 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 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