parent
7e15ccb63e
commit
b6d0f17127
19
CHANGELOG.md
19
CHANGELOG.md
|
@ -2,6 +2,25 @@
|
||||||
|
|
||||||
___
|
___
|
||||||
|
|
||||||
|
## v0.3.9
|
||||||
|
|
||||||
|
1. 简易AI框架
|
||||||
|
2. askForPoxi
|
||||||
|
3. 修复trigger函数的bug
|
||||||
|
4. 增加使用和打出的禁止技提示
|
||||||
|
5. 修复卡牌标记,attach主动技显示为蓝色按钮
|
||||||
|
6. 增加判断额外回合之法以及fix
|
||||||
|
7. 修复了询问卡牌时会返回不符合要求的牌的bug
|
||||||
|
8. 修复了摸牌阶段的skillname(游戏规则)
|
||||||
|
9. 实装武将牌堆
|
||||||
|
10. 剥离身份模式特有常备主逻辑
|
||||||
|
11. 为changeProperty添加时机
|
||||||
|
12. 分离了改判时的移动
|
||||||
|
13. 将canUseGeneral改为Engine所属函数
|
||||||
|
14. 新人教程
|
||||||
|
|
||||||
|
___
|
||||||
|
|
||||||
## v0.3.8
|
## v0.3.8
|
||||||
|
|
||||||
为国战添加专属ui,修复一些bug。
|
为国战添加专属ui,修复一些bug。
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
project(FreeKill VERSION 0.3.8)
|
project(FreeKill VERSION 0.3.9)
|
||||||
add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
|
add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
|
||||||
|
|
||||||
find_package(Qt6 REQUIRED COMPONENTS
|
find_package(Qt6 REQUIRED COMPONENTS
|
||||||
|
|
|
@ -30,6 +30,8 @@ QtObject {
|
||||||
property int preferredTimeout
|
property int preferredTimeout
|
||||||
property int preferredLuckTime
|
property int preferredLuckTime
|
||||||
|
|
||||||
|
property bool firstRun: true
|
||||||
|
|
||||||
// Player property of client
|
// Player property of client
|
||||||
property string serverAddr
|
property string serverAddr
|
||||||
property string screenName: ""
|
property string screenName: ""
|
||||||
|
@ -82,6 +84,7 @@ QtObject {
|
||||||
hideUseless = conf.hideUseless ?? false;
|
hideUseless = conf.hideUseless ?? false;
|
||||||
preferredTimeout = conf.preferredTimeout ?? 15;
|
preferredTimeout = conf.preferredTimeout ?? 15;
|
||||||
preferredLuckTime = conf.preferredLuckTime ?? 0;
|
preferredLuckTime = conf.preferredLuckTime ?? 0;
|
||||||
|
firstRun = conf.firstRun ?? true;
|
||||||
disabledGenerals = conf.disabledGenerals ?? [];
|
disabledGenerals = conf.disabledGenerals ?? [];
|
||||||
disableGeneralSchemes = conf.disableGeneralSchemes ?? [ disabledGenerals ];
|
disableGeneralSchemes = conf.disableGeneralSchemes ?? [ disabledGenerals ];
|
||||||
disableSchemeIdx = conf.disableSchemeIdx ?? 0;
|
disableSchemeIdx = conf.disableSchemeIdx ?? 0;
|
||||||
|
@ -109,6 +112,7 @@ QtObject {
|
||||||
conf.hideUseless = hideUseless;
|
conf.hideUseless = hideUseless;
|
||||||
conf.preferredTimeout = preferredTimeout;
|
conf.preferredTimeout = preferredTimeout;
|
||||||
conf.preferredLuckTime = preferredLuckTime;
|
conf.preferredLuckTime = preferredLuckTime;
|
||||||
|
conf.firstRun = firstRun;
|
||||||
conf.disabledGenerals = disabledGenerals;
|
conf.disabledGenerals = disabledGenerals;
|
||||||
conf.disableGeneralSchemes = disableGeneralSchemes;
|
conf.disableGeneralSchemes = disableGeneralSchemes;
|
||||||
conf.disableSchemeIdx = disableSchemeIdx;
|
conf.disableSchemeIdx = disableSchemeIdx;
|
||||||
|
|
|
@ -118,8 +118,7 @@ Item {
|
||||||
|
|
||||||
TapHandler {
|
TapHandler {
|
||||||
onTapped: {
|
onTapped: {
|
||||||
errDialog.txt = qsTr("$LoginFAQ");
|
mainStack.push(Qt.createComponent("../Tutorial.qml").createObject());
|
||||||
errDialog.open();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,71 @@
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
import QtQuick
|
||||||
|
import QtQuick.Controls
|
||||||
|
import QtQuick.Layouts
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: root
|
||||||
|
color: "#CCEEEEEE"
|
||||||
|
property int total: 7
|
||||||
|
|
||||||
|
SwipeView {
|
||||||
|
id: view
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
Repeater {
|
||||||
|
model: total
|
||||||
|
Item {
|
||||||
|
Text {
|
||||||
|
text: qsTr("tutor_msg_" + (modelData + 1))
|
||||||
|
font.pixelSize: 32
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: parent.width * 0.7
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
textFormat: Text.RichText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
PageIndicator {
|
||||||
|
id: indicator
|
||||||
|
|
||||||
|
count: total
|
||||||
|
currentIndex: view.currentIndex
|
||||||
|
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
Row {
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.bottomMargin: 20
|
||||||
|
spacing: 8
|
||||||
|
Text {
|
||||||
|
text: (view.currentIndex + 1) + "/" + total
|
||||||
|
font.pixelSize: 36
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
text: qsTr("Skip")
|
||||||
|
onClicked: mainStack.pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
text: qsTr("Prev")
|
||||||
|
enabled: view.currentIndex > 0
|
||||||
|
onClicked: view.currentIndex--
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
text: qsTr("Next")
|
||||||
|
enabled: view.currentIndex + 1 < total
|
||||||
|
onClicked: view.currentIndex++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -204,6 +204,10 @@ Window {
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
mainStack.push(init);
|
mainStack.push(init);
|
||||||
|
if (config.firstRun) {
|
||||||
|
config.firstRun = false;
|
||||||
|
mainStack.push(Qt.createComponent("Tutorial.qml").createObject());
|
||||||
|
}
|
||||||
if (!Debugging) {
|
if (!Debugging) {
|
||||||
splashLoader.source = "Splash.qml";
|
splashLoader.source = "Splash.qml";
|
||||||
splashLoader.item.disappeared.connect(() => {
|
splashLoader.item.disappeared.connect(() => {
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.notify.FreeKill"
|
package="org.notify.FreeKill"
|
||||||
android:installLocation="preferExternal"
|
android:installLocation="preferExternal"
|
||||||
android:versionCode="308"
|
android:versionCode="309"
|
||||||
android:versionName="0.3.8">
|
android:versionName="0.3.9">
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||||
|
|
|
@ -454,4 +454,66 @@
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
|
||||||
|
<context>
|
||||||
|
<name>Tutorial</name>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_1</source>
|
||||||
|
<translation>欢迎来到新月杀!<br>
|
||||||
|
由于是第一次运行,先来看看说明吧。<br>
|
||||||
|
跳过了也没关系,只要点击主界面的“<font color="blue"><u>常见疑问</u></font>”,就能随时查看。</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_2</source>
|
||||||
|
<translation>新月杀是一款免费三国杀类型游戏,<br>
|
||||||
|
使用GPLv3协议进行开源!<br>
|
||||||
|
有关项目的详细信息可以在进入大厅后,<br>
|
||||||
|
点击右下角“关于”按钮查看。</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_3</source>
|
||||||
|
<translation>新月杀本身默认只含标准包!<br>
|
||||||
|
想要体验更多武将,就要通过联机获取!<br>
|
||||||
|
在主界面点击“加入服务器” -> 添加服务器。<br>
|
||||||
|
(目前推荐的服务器IP是175.178.66.93)</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_4</source>
|
||||||
|
<translation>连接到服务器也可能不是一帆风顺。<br>
|
||||||
|
有时候你可能用了别人已注册的用户名,<br>
|
||||||
|
或者输错了IP等等。遇到错误不要心急,<br>
|
||||||
|
仔细注意一下屏幕底部的提示信息吧。</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_5</source>
|
||||||
|
<translation>更多指引可以去查阅下载链接附送的pdf。
|
||||||
|
这些pdf都是由开发者们编写的,不仅能让你快速掌握游戏的深入玩法,
|
||||||
|
还可以告诉你关于开设私服、制作拓展之类的知识。</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_6</source>
|
||||||
|
<translation>如果想联系我们,可以用这些方式:<br>
|
||||||
|
百度贴吧:新月杀吧<br>
|
||||||
|
Discord群组:https://discord.gg/tp35GrQR6v<br>
|
||||||
|
QQ频道:freekill01<br>
|
||||||
|
QQ群太容易满啦,就不发群号了</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>tutor_msg_7</source>
|
||||||
|
<translation>感谢你能看完这些!<br>
|
||||||
|
那么接下来祝你游戏愉快!<br>
|
||||||
|
(免费联机游戏,还请素质打牌!)</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Skip</source>
|
||||||
|
<translation>跳过</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Prev</source>
|
||||||
|
<translation>上一条</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Next</source>
|
||||||
|
<translation>下一条</translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
</TS>
|
</TS>
|
||||||
|
|
Loading…
Reference in New Issue