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
|
@ -8,3 +8,12 @@ FreeKill
|
||||||
FreeKill.exe
|
FreeKill.exe
|
||||||
freekill-wrap.cxx
|
freekill-wrap.cxx
|
||||||
server/users.db
|
server/users.db
|
||||||
|
bearer/
|
||||||
|
iconengines/
|
||||||
|
imageformats/
|
||||||
|
platforms/
|
||||||
|
Qt/
|
||||||
|
QtGraphicalEffects/
|
||||||
|
QtQuick/
|
||||||
|
QtQuick.2/
|
||||||
|
*.dll
|
||||||
|
|
After Width: | Height: | Size: 64 KiB |
After Width: | Height: | Size: 6.0 KiB |
After Width: | Height: | Size: 499 B |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 500 B |
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 531 B |
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 533 B |
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 519 B |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 177 KiB |
|
@ -1,7 +1,7 @@
|
||||||
-- All functions in this file are used by Qml
|
-- All functions in this file are used by Qml
|
||||||
|
|
||||||
function Translate(src)
|
function Translate(src)
|
||||||
return Fk.translations[src]
|
return Fk:translate(src)
|
||||||
end
|
end
|
||||||
|
|
||||||
function GetGeneralData(name)
|
function GetGeneralData(name)
|
||||||
|
@ -143,3 +143,51 @@ function CardFeasible(card, selected_targets)
|
||||||
local ret = c.skill:feasible(selected_cards, selected_targets)
|
local ret = c.skill:feasible(selected_cards, selected_targets)
|
||||||
return json.encode(ret)
|
return json.encode(ret)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Fk:loadTranslationTable{
|
||||||
|
-- Lobby
|
||||||
|
["Room List"] = "房间列表",
|
||||||
|
["Enter"] = "进入",
|
||||||
|
|
||||||
|
["Edit Profile"] = "编辑个人信息",
|
||||||
|
["Username"] = "用户名",
|
||||||
|
["Avatar"] = "头像",
|
||||||
|
["Old Password"] = "旧密码",
|
||||||
|
["New Password"] = "新密码",
|
||||||
|
["Update Avatar"] = "更新头像",
|
||||||
|
["Update Password"] = "更新密码",
|
||||||
|
|
||||||
|
["Create Room"] = "创建房间",
|
||||||
|
["Room Name"] = "房间名字",
|
||||||
|
["$RoomName"] = "%1的房间",
|
||||||
|
["Player num"] = "玩家数目",
|
||||||
|
|
||||||
|
["Generals Overview"] = "武将一览",
|
||||||
|
["Cards Overview"] = "卡牌一览",
|
||||||
|
["Scenarios Overview"] = "玩法一览",
|
||||||
|
["About"] = "关于",
|
||||||
|
["Exit Lobby"] = "退出大厅",
|
||||||
|
|
||||||
|
["OK"] = "确定",
|
||||||
|
["Cancel"] = "取消",
|
||||||
|
["End"] = "结束",
|
||||||
|
["Quit"] = "退出",
|
||||||
|
|
||||||
|
["$WelcomeToLobby"] = "欢迎进入FreeKill游戏大厅!",
|
||||||
|
|
||||||
|
-- Room
|
||||||
|
["$EnterRoom"] = "成功加入房间。",
|
||||||
|
["$Choice"] = "%1:请选择",
|
||||||
|
["$ChooseGeneral"] = "请选择 %1 名武将",
|
||||||
|
["Fight"] = "出战",
|
||||||
|
|
||||||
|
["#PlayCard"] = "出牌阶段,请使用一张牌",
|
||||||
|
["#AskForGeneral"] = "请选择 1 名武将",
|
||||||
|
["#AskForSkillInvoke"] = "你想发动技能“%1”吗?",
|
||||||
|
["#AskForChoice"] = "%1:请选择",
|
||||||
|
|
||||||
|
[" thinking..."] = " 思考中...",
|
||||||
|
["AskForGeneral"] = "选择武将",
|
||||||
|
["AskForChoice"] = "选择",
|
||||||
|
["PlayCard"] = "出牌",
|
||||||
|
}
|
||||||
|
|
|
@ -83,6 +83,12 @@ function Engine:loadTranslationTable(t)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function Engine:translate(src)
|
||||||
|
local ret = self.translations[src]
|
||||||
|
if not ret then return src end
|
||||||
|
return ret
|
||||||
|
end
|
||||||
|
|
||||||
---@param skill Skill
|
---@param skill Skill
|
||||||
function Engine:addSkill(skill)
|
function Engine:addSkill(skill)
|
||||||
assert(skill.class:isSubclassOf(Skill))
|
assert(skill.class:isSubclassOf(Skill))
|
||||||
|
|
|
@ -84,6 +84,7 @@ GameRule = fk.CreateTriggerSkill{
|
||||||
end,
|
end,
|
||||||
[Player.Play] = function()
|
[Player.Play] = function()
|
||||||
while not player.dead do
|
while not player.dead do
|
||||||
|
room:notifyMoveFocus(player, "PlayCard")
|
||||||
local result = room:doRequest(player, "PlayCard", player:getId())
|
local result = room:doRequest(player, "PlayCard", player:getId())
|
||||||
if result == "" then break end
|
if result == "" then break end
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ Fk:loadTranslationTable{
|
||||||
["xuchu"] = "许褚",
|
["xuchu"] = "许褚",
|
||||||
}
|
}
|
||||||
|
|
||||||
local guojia = General:new(extension, "guojia", "wei", 4)
|
local guojia = General:new(extension, "guojia", "wei", 3)
|
||||||
extension:addGeneral(guojia)
|
extension:addGeneral(guojia)
|
||||||
Fk:loadTranslationTable{
|
Fk:loadTranslationTable{
|
||||||
["guojia"] = "郭嘉",
|
["guojia"] = "郭嘉",
|
||||||
|
|
|
@ -17,12 +17,12 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Text {
|
Text {
|
||||||
text: "Room Name"
|
text: Backend.translate("Room Name")
|
||||||
}
|
}
|
||||||
TextField {
|
TextField {
|
||||||
id: roomName
|
id: roomName
|
||||||
font.pixelSize: 18
|
font.pixelSize: 18
|
||||||
text: Self.screenName + "'s Room"
|
text: Backend.translate("$RoomName").arg(Self.screenName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Text {
|
Text {
|
||||||
text: "Player num"
|
text: Backend.translate("Player num")
|
||||||
}
|
}
|
||||||
SpinBox {
|
SpinBox {
|
||||||
id: playerNum
|
id: playerNum
|
||||||
|
@ -43,7 +43,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Button {
|
Button {
|
||||||
text: "OK"
|
text: Backend.translate("OK")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
root.finished();
|
root.finished();
|
||||||
mainWindow.busy = true;
|
mainWindow.busy = true;
|
||||||
|
@ -54,7 +54,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Cancel"
|
text: Backend.translate("Cancel")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
root.finished();
|
root.finished();
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Text {
|
Text {
|
||||||
text: "Username"
|
text: Backend.translate("Username")
|
||||||
}
|
}
|
||||||
Text {
|
Text {
|
||||||
text: Self.screenName
|
text: Self.screenName
|
||||||
|
@ -29,7 +29,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Text {
|
Text {
|
||||||
text: "Avatar"
|
text: Backend.translate("Avatar")
|
||||||
}
|
}
|
||||||
TextField {
|
TextField {
|
||||||
id: avatarName
|
id: avatarName
|
||||||
|
@ -42,7 +42,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Text {
|
Text {
|
||||||
text: "Old Password"
|
text: Backend.translate("Old Password")
|
||||||
}
|
}
|
||||||
TextField {
|
TextField {
|
||||||
id: oldPassword
|
id: oldPassword
|
||||||
|
@ -55,7 +55,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Text {
|
Text {
|
||||||
text: "New Password"
|
text: Backend.translate("New Password")
|
||||||
}
|
}
|
||||||
TextField {
|
TextField {
|
||||||
id: newPassword
|
id: newPassword
|
||||||
|
@ -68,7 +68,7 @@ Item {
|
||||||
anchors.rightMargin: 8
|
anchors.rightMargin: 8
|
||||||
spacing: 16
|
spacing: 16
|
||||||
Button {
|
Button {
|
||||||
text: "Update Avatar"
|
text: Backend.translate("Update Avatar")
|
||||||
enabled: avatarName.text !== ""
|
enabled: avatarName.text !== ""
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainWindow.busy = true;
|
mainWindow.busy = true;
|
||||||
|
@ -79,7 +79,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Update Password"
|
text: Backend.translate("Update Password")
|
||||||
enabled: oldPassword.text !== "" && newPassword.text !== ""
|
enabled: oldPassword.text !== "" && newPassword.text !== ""
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainWindow.busy = true;
|
mainWindow.busy = true;
|
||||||
|
@ -90,7 +90,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Exit"
|
text: Backend.translate("Quit")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
root.finished();
|
root.finished();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
import QtQuick 2.0
|
|
||||||
|
|
||||||
Text {
|
|
||||||
text: "dsdsd"
|
|
||||||
}
|
|
15
qml/Logic.js
|
@ -1,3 +1,17 @@
|
||||||
|
var generalsOverviewPage, cardsOverviewPage;
|
||||||
|
var clientPageCreated = false;
|
||||||
|
function createClientPages() {
|
||||||
|
if (!clientPageCreated) {
|
||||||
|
clientPageCreated = true;
|
||||||
|
|
||||||
|
generalsOverviewPage = generalsOverview.createObject(mainWindow);
|
||||||
|
cardsOverviewPage = cardsOverview.createObject(mainWindow);
|
||||||
|
|
||||||
|
mainWindow.generalsOverviewPage = generalsOverviewPage;
|
||||||
|
mainWindow.cardsOverviewPage = cardsOverviewPage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var callbacks = {};
|
var callbacks = {};
|
||||||
|
|
||||||
callbacks["NetworkDelayTest"] = function(jsonData) {
|
callbacks["NetworkDelayTest"] = function(jsonData) {
|
||||||
|
@ -21,6 +35,7 @@ callbacks["BackToStart"] = function(jsonData) {
|
||||||
|
|
||||||
callbacks["EnterLobby"] = function(jsonData) {
|
callbacks["EnterLobby"] = function(jsonData) {
|
||||||
// depth == 1 means the lobby page is not present in mainStack
|
// depth == 1 means the lobby page is not present in mainStack
|
||||||
|
createClientPages();
|
||||||
if (mainStack.depth === 1) {
|
if (mainStack.depth === 1) {
|
||||||
mainStack.push(lobby);
|
mainStack.push(lobby);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -36,7 +36,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
text: "Quit"
|
text: Backend.translate("Quit")
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainStack.pop();
|
mainStack.pop();
|
||||||
|
|
|
@ -25,11 +25,7 @@ Item {
|
||||||
model: JSON.parse(Backend.callLuaFunction("GetGenerals", [name]))
|
model: JSON.parse(Backend.callLuaFunction("GetGenerals", [name]))
|
||||||
GeneralCardItem {
|
GeneralCardItem {
|
||||||
autoBack: false
|
autoBack: false
|
||||||
Component.onCompleted: {
|
name: modelData
|
||||||
let data = JSON.parse(Backend.callLuaFunction("GetGeneralData", [modelData]));
|
|
||||||
name = modelData;
|
|
||||||
kingdom = data.kingdom;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -37,7 +33,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
text: "Quit"
|
text: Backend.translate("Quit")
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainStack.pop();
|
mainStack.pop();
|
||||||
|
|
|
@ -7,6 +7,11 @@ Item {
|
||||||
Frame {
|
Frame {
|
||||||
id: join_server
|
id: join_server
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
background: Rectangle {
|
||||||
|
color: "#88888888"
|
||||||
|
radius: 2
|
||||||
|
}
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
spacing: 8
|
spacing: 8
|
||||||
TextField {
|
TextField {
|
||||||
|
|
|
@ -10,36 +10,23 @@ Item {
|
||||||
Component {
|
Component {
|
||||||
id: roomDelegate
|
id: roomDelegate
|
||||||
|
|
||||||
RowLayout {
|
Item {
|
||||||
width: roomList.width * 0.9
|
height: 18
|
||||||
spacing: 16
|
width: roomList.width
|
||||||
Text {
|
|
||||||
text: roomId
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
Rectangle {
|
||||||
horizontalAlignment: Text.AlignHCenter
|
anchors.fill: parent
|
||||||
Layout.fillWidth: true
|
color: "white"
|
||||||
text: roomName
|
opacity: 0
|
||||||
}
|
radius: 2
|
||||||
|
Behavior on opacity {
|
||||||
Text {
|
NumberAnimation { duration: 300; easing.type: Easing.InOutQuad }
|
||||||
text: gameMode
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
|
||||||
color: (playerNum == capacity) ? "red" : "black"
|
|
||||||
text: playerNum + "/" + capacity
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
|
||||||
text: "Enter"
|
|
||||||
font.underline: true
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
onEntered: { parent.color = "blue" }
|
onEntered: parent.opacity = 1;
|
||||||
onExited: { parent.color = "black" }
|
onExited: parent.opacity = 0;
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainWindow.busy = true;
|
mainWindow.busy = true;
|
||||||
ClientInstance.notifyServer(
|
ClientInstance.notifyServer(
|
||||||
|
@ -49,6 +36,29 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
spacing: 16
|
||||||
|
Text {
|
||||||
|
text: roomId
|
||||||
|
}
|
||||||
|
|
||||||
|
Text {
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
Layout.fillWidth: true
|
||||||
|
text: roomName
|
||||||
|
}
|
||||||
|
|
||||||
|
Text {
|
||||||
|
text: gameMode
|
||||||
|
}
|
||||||
|
|
||||||
|
Text {
|
||||||
|
color: (playerNum == capacity) ? "red" : "black"
|
||||||
|
text: playerNum + "/" + capacity
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,65 +68,70 @@ Item {
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
Rectangle {
|
Item {
|
||||||
Layout.preferredWidth: root.width * 0.7
|
Layout.preferredWidth: root.width * 0.7
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
color: "#e2e2e1"
|
Rectangle {
|
||||||
radius: 4
|
width: parent.width * 0.8
|
||||||
Text {
|
height: parent.height * 0.8
|
||||||
width: parent.width
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
|
||||||
text: "Room List"
|
|
||||||
}
|
|
||||||
ListView {
|
|
||||||
height: parent.height * 0.9
|
|
||||||
width: parent.width * 0.95
|
|
||||||
contentHeight: roomDelegate.height * count
|
|
||||||
ScrollBar.vertical: ScrollBar {}
|
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
id: roomList
|
color: "#88888888"
|
||||||
delegate: roomDelegate
|
radius: 16
|
||||||
model: roomModel
|
Text {
|
||||||
|
width: parent.width
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
text: Backend.translate("Room List")
|
||||||
|
}
|
||||||
|
ListView {
|
||||||
|
id: roomList
|
||||||
|
height: parent.height * 0.9
|
||||||
|
width: parent.width * 0.95
|
||||||
|
contentHeight: roomDelegate.height * count
|
||||||
|
ScrollBar.vertical: ScrollBar {}
|
||||||
|
anchors.centerIn: parent
|
||||||
|
delegate: roomDelegate
|
||||||
|
model: roomModel
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Button {
|
Button {
|
||||||
text: "Edit Profile"
|
text: Backend.translate("Edit Profile")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
globalPopup.source = "EditProfile.qml";
|
globalPopup.source = "EditProfile.qml";
|
||||||
globalPopup.open();
|
globalPopup.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Create Room"
|
text: Backend.translate("Create Room")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
globalPopup.source = "CreateRoom.qml";
|
globalPopup.source = "CreateRoom.qml";
|
||||||
globalPopup.open();
|
globalPopup.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Generals Overview"
|
text: Backend.translate("Generals Overview")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainStack.push(generalsOverview);
|
mainStack.push(mainWindow.generalsOverviewPage);
|
||||||
mainStack.currentItem.loadPackages();
|
mainStack.currentItem.loadPackages();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Cards Overview"
|
text: Backend.translate("Cards Overview")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainStack.push(cardsOverview);
|
mainStack.push(mainWindow.cardsOverviewPage);
|
||||||
mainStack.currentItem.loadPackages();
|
mainStack.currentItem.loadPackages();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Scenarios Overview"
|
text: Backend.translate("Scenarios Overview")
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "About"
|
text: Backend.translate("About")
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
text: "Exit Lobby"
|
text: Backend.translate("Exit Lobby")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
toast.show("Goodbye.");
|
toast.show("Goodbye.");
|
||||||
Backend.quitLobby();
|
Backend.quitLobby();
|
||||||
|
@ -152,7 +167,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
toast.show("Welcome to FreeKill lobby!");
|
toast.show(Backend.translate("$WelcomeToLobby"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,23 +18,13 @@ Item {
|
||||||
|
|
||||||
property var selected_targets: []
|
property var selected_targets: []
|
||||||
|
|
||||||
// tmp
|
Image {
|
||||||
Row {
|
source: AppPath + "/image/gamebg"
|
||||||
Button{text:"摸1牌"
|
anchors.fill: parent
|
||||||
onClicked:{
|
fillMode: Image.PreserveAspectCrop
|
||||||
Logic.moveCards([{
|
|
||||||
from:Logic.Player.DrawPile,
|
|
||||||
to:Logic.Player.PlaceHand,
|
|
||||||
cards:[1],
|
|
||||||
}])
|
|
||||||
}}
|
|
||||||
Button{text:"弃1牌"
|
|
||||||
onClicked:{Logic.moveCards([{
|
|
||||||
to:Logic.Player.DrawPile,
|
|
||||||
from:Logic.Player.PlaceHand,
|
|
||||||
cards:[1],
|
|
||||||
}])}}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// tmp
|
||||||
Button {
|
Button {
|
||||||
text: "quit"
|
text: "quit"
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
@ -253,20 +243,20 @@ Item {
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: okButton
|
id: okButton
|
||||||
text: "OK"
|
text: Backend.translate("OK")
|
||||||
onClicked: Logic.doOkButton();
|
onClicked: Logic.doOkButton();
|
||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: cancelButton
|
id: cancelButton
|
||||||
text: "Cancel"
|
text: Backend.translate("Cancel")
|
||||||
onClicked: Logic.doCancelButton();
|
onClicked: Logic.doCancelButton();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: endPhaseButton
|
id: endPhaseButton
|
||||||
text: "End"
|
text: Backend.translate("End")
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.bottomMargin: 40
|
anchors.bottomMargin: 40
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
@ -301,7 +291,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
toast.show("Sucesessfully entered room.");
|
toast.show(Backend.translate("$EnterRoom"));
|
||||||
|
|
||||||
dashboardModel = {
|
dashboardModel = {
|
||||||
id: Self.id,
|
id: Self.id,
|
||||||
|
|
|
@ -117,7 +117,7 @@ Item {
|
||||||
visible: footnoteVisible
|
visible: footnoteVisible
|
||||||
wrapMode: Text.WrapAnywhere
|
wrapMode: Text.WrapAnywhere
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
glow.color: "black"
|
glow.color: "black"
|
||||||
glow.spread: 1
|
glow.spread: 1
|
||||||
|
|
|
@ -7,7 +7,7 @@ GraphicsBox {
|
||||||
property int result
|
property int result
|
||||||
|
|
||||||
id: root
|
id: root
|
||||||
title.text: skill_name + ": Please choose"
|
title.text: Backend.translate("$Choice").arg(Backend.translate(skill_name))
|
||||||
width: Math.max(140, body.width + 20)
|
width: Math.max(140, body.width + 20)
|
||||||
height: body.height + title.height + 20
|
height: body.height + title.height + 20
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ GraphicsBox {
|
||||||
model: options
|
model: options
|
||||||
|
|
||||||
MetroButton {
|
MetroButton {
|
||||||
text: modelData
|
text: Backend.translate(modelData)
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
|
|
@ -15,7 +15,7 @@ GraphicsBox {
|
||||||
}
|
}
|
||||||
|
|
||||||
id: root
|
id: root
|
||||||
title.text: qsTr("Please choose ") + choiceNum + qsTr(" general(s)")
|
title.text: Backend.translate("$ChooseGeneral").arg(choiceNum)
|
||||||
width: generalArea.width + body.anchors.leftMargin + body.anchors.rightMargin
|
width: generalArea.width + body.anchors.leftMargin + body.anchors.rightMargin
|
||||||
height: body.implicitHeight + body.anchors.topMargin + body.anchors.bottomMargin
|
height: body.implicitHeight + body.anchors.topMargin + body.anchors.bottomMargin
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ GraphicsBox {
|
||||||
id: fightButton
|
id: fightButton
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
text: qsTr("Fight")
|
text: Backend.translate("Fight")
|
||||||
width: 120
|
width: 120
|
||||||
height: 35
|
height: 35
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
|
@ -13,12 +13,62 @@ import "../skin-bank.js" as SkinBank
|
||||||
*/
|
*/
|
||||||
|
|
||||||
CardItem {
|
CardItem {
|
||||||
property string kingdom: "qun"
|
property string kingdom
|
||||||
name: "caocao"
|
property int hp
|
||||||
|
name: ""
|
||||||
// description: Sanguosha.getGeneralDescription(name)
|
// description: Sanguosha.getGeneralDescription(name)
|
||||||
suit: ""
|
suit: ""
|
||||||
number: 0
|
number: 0
|
||||||
footnote: ""
|
footnote: ""
|
||||||
card.source: SkinBank.GENERAL_DIR + name
|
card.source: SkinBank.GENERAL_DIR + name
|
||||||
glow.color: "white" //Engine.kingdomColor[kingdom]
|
glow.color: "white" //Engine.kingdomColor[kingdom]
|
||||||
|
|
||||||
|
Image {
|
||||||
|
source: SkinBank.GENERALCARD_DIR + "border"
|
||||||
|
}
|
||||||
|
|
||||||
|
Image {
|
||||||
|
source: SkinBank.GENERALCARD_DIR + kingdom
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
x: 34
|
||||||
|
y: 4
|
||||||
|
spacing: 1
|
||||||
|
Repeater {
|
||||||
|
model: hp > 5 ? 1 : hp
|
||||||
|
Image {
|
||||||
|
source: SkinBank.GENERALCARD_DIR + kingdom + "-magatama"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Text {
|
||||||
|
visible: hp > 5
|
||||||
|
text: "x" + hp
|
||||||
|
color: "white"
|
||||||
|
font.pixelSize: 14
|
||||||
|
style: Text.Outline
|
||||||
|
y: -6
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Text {
|
||||||
|
width: 20
|
||||||
|
height: 80
|
||||||
|
x: 2
|
||||||
|
y: lineCount > 6 ? 30 : 34
|
||||||
|
text: Backend.translate(name)
|
||||||
|
color: "white"
|
||||||
|
font.family: fontLiSu.name
|
||||||
|
font.pixelSize: 18
|
||||||
|
lineHeight: Math.max(1.4 - lineCount / 10, 0.6)
|
||||||
|
style: Text.Outline
|
||||||
|
wrapMode: Text.WrapAnywhere
|
||||||
|
}
|
||||||
|
|
||||||
|
onNameChanged: {
|
||||||
|
let data = JSON.parse(Backend.callLuaFunction("GetGeneralData", [name]));
|
||||||
|
kingdom = data.kingdom;
|
||||||
|
hp = data.hp;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,6 +38,15 @@ Item {
|
||||||
property bool selectable: false
|
property bool selectable: false
|
||||||
property bool selected: false
|
property bool selected: false
|
||||||
|
|
||||||
|
property bool playing: false
|
||||||
|
onPlayingChanged: {
|
||||||
|
if (playing) {
|
||||||
|
animPlaying.start();
|
||||||
|
} else {
|
||||||
|
animPlaying.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Behavior on x {
|
Behavior on x {
|
||||||
NumberAnimation { duration: 600; easing.type: Easing.InOutQuad }
|
NumberAnimation { duration: 600; easing.type: Easing.InOutQuad }
|
||||||
}
|
}
|
||||||
|
@ -48,8 +57,8 @@ Item {
|
||||||
|
|
||||||
states: [
|
states: [
|
||||||
State { name: "normal" },
|
State { name: "normal" },
|
||||||
State { name: "candidate" },
|
State { name: "candidate" }
|
||||||
State { name: "playing" }
|
//State { name: "playing" }
|
||||||
//State { name: "responding" },
|
//State { name: "responding" },
|
||||||
//State { name: "sos" }
|
//State { name: "sos" }
|
||||||
]
|
]
|
||||||
|
@ -60,22 +69,12 @@ Item {
|
||||||
from: "*"; to: "normal"
|
from: "*"; to: "normal"
|
||||||
ScriptAction {
|
ScriptAction {
|
||||||
script: {
|
script: {
|
||||||
animPlaying.stop();
|
|
||||||
animSelectable.stop();
|
animSelectable.stop();
|
||||||
animSelected.stop();
|
animSelected.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
Transition {
|
|
||||||
from: "*"; to: "playing"
|
|
||||||
ScriptAction {
|
|
||||||
script: {
|
|
||||||
animPlaying.start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
Transition {
|
Transition {
|
||||||
from: "*"; to: "candidate"
|
from: "*"; to: "candidate"
|
||||||
ScriptAction {
|
ScriptAction {
|
||||||
|
@ -93,7 +92,7 @@ Item {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
loop: true
|
loop: true
|
||||||
scale: 1.1
|
scale: 1.1
|
||||||
visible: root.state === "playing"
|
visible: root.playing
|
||||||
}
|
}
|
||||||
|
|
||||||
PixmapAnimation {
|
PixmapAnimation {
|
||||||
|
@ -114,7 +113,7 @@ Item {
|
||||||
id: generalName
|
id: generalName
|
||||||
x: 5
|
x: 5
|
||||||
y: 28
|
y: 28
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
font.pixelSize: 22
|
font.pixelSize: 22
|
||||||
opacity: 0.7
|
opacity: 0.7
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
@ -234,7 +233,7 @@ Item {
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
text: root.handcards
|
text: root.handcards
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
font.pixelSize: 32
|
font.pixelSize: 32
|
||||||
//font.weight: 30
|
//font.weight: 30
|
||||||
color: "white"
|
color: "white"
|
||||||
|
@ -276,7 +275,7 @@ Item {
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.bottomMargin: -32
|
anchors.bottomMargin: -32
|
||||||
property var seatChr: ["一", "二", "三", "四", "五", "六", "七", "八"]
|
property var seatChr: ["一", "二", "三", "四", "五", "六", "七", "八"]
|
||||||
font.family: "FZLiShu II-S06S"
|
font.family: fontLi2.name
|
||||||
font.pixelSize: 32
|
font.pixelSize: 32
|
||||||
text: seatChr[seatNumber - 1]
|
text: seatChr[seatNumber - 1]
|
||||||
|
|
||||||
|
@ -339,7 +338,7 @@ Item {
|
||||||
visible: progressTip.text != ""
|
visible: progressTip.text != ""
|
||||||
Text {
|
Text {
|
||||||
id: progressTip
|
id: progressTip
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
font.pixelSize: 18
|
font.pixelSize: 18
|
||||||
x: 18
|
x: 18
|
||||||
color: "white"
|
color: "white"
|
||||||
|
|
|
@ -35,7 +35,7 @@ Item {
|
||||||
visible: number > 0 && number < 14
|
visible: number > 0 && number < 14
|
||||||
text: Utility.convertNumber(number)
|
text: Utility.convertNumber(number)
|
||||||
color: "white"
|
color: "white"
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
font.pixelSize: 16
|
font.pixelSize: 16
|
||||||
glow.color: "black"
|
glow.color: "black"
|
||||||
glow.spread: 0.75
|
glow.spread: 0.75
|
||||||
|
@ -47,7 +47,7 @@ Item {
|
||||||
|
|
||||||
GlowText {
|
GlowText {
|
||||||
id: textItem
|
id: textItem
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
color: "white"
|
color: "white"
|
||||||
font.pixelSize: 18
|
font.pixelSize: 18
|
||||||
glow.color: "black"
|
glow.color: "black"
|
||||||
|
|
|
@ -28,7 +28,7 @@ Column {
|
||||||
width: root.width
|
width: root.width
|
||||||
text: value
|
text: value
|
||||||
color: root.colors[(value >= 3 || value >= maxValue) ? 3 : (value <= 0 ? 0 : value)]
|
color: root.colors[(value >= 3 || value >= maxValue) ? 3 : (value <= 0 ? 0 : value)]
|
||||||
font.family: "FZLiBian-S02"
|
font.family: fontLibian.name
|
||||||
font.pixelSize: 22
|
font.pixelSize: 22
|
||||||
font.bold: true
|
font.bold: true
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
|
@ -392,7 +392,25 @@ callbacks["MoveFocus"] = function(jsonData) {
|
||||||
if (focuses.indexOf(model.id) != -1) {
|
if (focuses.indexOf(model.id) != -1) {
|
||||||
item = photos.itemAt(i);
|
item = photos.itemAt(i);
|
||||||
item.progressBar.visible = true;
|
item.progressBar.visible = true;
|
||||||
item.progressTip = command + " thinking...";
|
item.progressTip = Backend.translate(command)
|
||||||
|
+ Backend.translate(" thinking...");
|
||||||
|
|
||||||
|
if (command === "PlayCard") {
|
||||||
|
item.playing = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
item = photos.itemAt(i);
|
||||||
|
if (command === "PlayCard") {
|
||||||
|
item.playing = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command === "PlayCard") {
|
||||||
|
if (focuses.indexOf(Self.id) != -1) {
|
||||||
|
dashboard.self.playing = true;
|
||||||
|
} else {
|
||||||
|
dashboard.self.playing = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -413,7 +431,7 @@ callbacks["AskForGeneral"] = function(jsonData) {
|
||||||
// jsonData: string[] Generals
|
// jsonData: string[] Generals
|
||||||
// TODO: choose multiple generals
|
// TODO: choose multiple generals
|
||||||
let data = JSON.parse(jsonData);
|
let data = JSON.parse(jsonData);
|
||||||
roomScene.promptText = "Please choose 1 general";
|
roomScene.promptText = Backend.translate("#AskForGeneral");
|
||||||
roomScene.state = "replying";
|
roomScene.state = "replying";
|
||||||
roomScene.popupBox.source = "RoomElement/ChooseGeneralBox.qml";
|
roomScene.popupBox.source = "RoomElement/ChooseGeneralBox.qml";
|
||||||
let box = roomScene.popupBox.item;
|
let box = roomScene.popupBox.item;
|
||||||
|
@ -428,7 +446,8 @@ callbacks["AskForGeneral"] = function(jsonData) {
|
||||||
|
|
||||||
callbacks["AskForSkillInvoke"] = function(jsonData) {
|
callbacks["AskForSkillInvoke"] = function(jsonData) {
|
||||||
// jsonData: string name
|
// jsonData: string name
|
||||||
roomScene.promptText = "Do you want to invoke '" + jsonData + "' ?";
|
roomScene.promptText = Backend.translate("#AskForSkillInvoke")
|
||||||
|
.arg(Backend.translate(jsonData));
|
||||||
roomScene.state = "responding";
|
roomScene.state = "responding";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -438,7 +457,8 @@ callbacks["AskForChoice"] = function(jsonData) {
|
||||||
let data = JSON.parse(jsonData);
|
let data = JSON.parse(jsonData);
|
||||||
let choices = data[0];
|
let choices = data[0];
|
||||||
let skill_name = data[1];
|
let skill_name = data[1];
|
||||||
roomScene.promptText = skill_name + ": Please make choice";
|
roomScene.promptText = Backend.translate("#AskForChoice")
|
||||||
|
.arg(Backend.translate(jsonData));;
|
||||||
roomScene.state = "replying";
|
roomScene.state = "replying";
|
||||||
roomScene.popupBox.source = "RoomElement/ChoiceBox.qml";
|
roomScene.popupBox.source = "RoomElement/ChoiceBox.qml";
|
||||||
let box = roomScene.popupBox.item;
|
let box = roomScene.popupBox.item;
|
||||||
|
@ -459,7 +479,7 @@ callbacks["PlayCard"] = function(jsonData) {
|
||||||
// jsonData: int playerId
|
// jsonData: int playerId
|
||||||
let playerId = parseInt(jsonData);
|
let playerId = parseInt(jsonData);
|
||||||
if (playerId == Self.id) {
|
if (playerId == Self.id) {
|
||||||
roomScene.promptText = "Please use a card";
|
roomScene.promptText = Backend.translate("#PlayCard");
|
||||||
roomScene.state = "playing";
|
roomScene.state = "playing";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
var PHOTO_BACK_DIR = AppPath + "/image/photo/back/";
|
var PHOTO_BACK_DIR = AppPath + "/image/photo/back/";
|
||||||
var PHOTO_DIR = AppPath + "/image/photo/";
|
var PHOTO_DIR = AppPath + "/image/photo/";
|
||||||
var GENERAL_DIR = AppPath + "/image/generals/";
|
var GENERAL_DIR = AppPath + "/image/generals/";
|
||||||
|
var GENERALCARD_DIR = AppPath + "/image/card/general/";
|
||||||
var STATE_DIR = AppPath + "/image/photo/state/";
|
var STATE_DIR = AppPath + "/image/photo/state/";
|
||||||
var STATUS_DIR = AppPath + "/image/photo/status/";
|
var STATUS_DIR = AppPath + "/image/photo/status/";
|
||||||
var ROLE_DIR = AppPath + "/image/photo/role/";
|
var ROLE_DIR = AppPath + "/image/photo/role/";
|
||||||
|
|
13
qml/main.qml
|
@ -11,6 +11,16 @@ Window {
|
||||||
height: 480
|
height: 480
|
||||||
property var callbacks: Logic.callbacks
|
property var callbacks: Logic.callbacks
|
||||||
|
|
||||||
|
Image {
|
||||||
|
source: AppPath + "/image/background"
|
||||||
|
anchors.fill: parent
|
||||||
|
fillMode: Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
|
|
||||||
|
FontLoader { id: fontLiSu; source: AppPath + "/fonts/simli.ttf" }
|
||||||
|
FontLoader { id: fontLibian; source: AppPath + "/fonts/FZLBGBK.ttf" }
|
||||||
|
FontLoader { id: fontLi2; source: AppPath + "/fonts/FZLE.ttf" }
|
||||||
|
|
||||||
StackView {
|
StackView {
|
||||||
id: mainStack
|
id: mainStack
|
||||||
visible: !mainWindow.busy
|
visible: !mainWindow.busy
|
||||||
|
@ -24,6 +34,9 @@ Window {
|
||||||
Component { id: cardsOverview; CardsOverview {} }
|
Component { id: cardsOverview; CardsOverview {} }
|
||||||
Component { id: room; Room {} }
|
Component { id: room; Room {} }
|
||||||
|
|
||||||
|
property var generalsOverviewPage
|
||||||
|
property var cardsOverviewPage
|
||||||
|
|
||||||
property bool busy: false
|
property bool busy: false
|
||||||
BusyIndicator {
|
BusyIndicator {
|
||||||
running: true
|
running: true
|
||||||
|
|