Changelog: v0.2.3

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ___
 
+## v0.2.3
+
+啥也没干，光修bug去了
+
+1. 修事件记录器查询
+2. 修安卓没法退出
+3. 修某些秘密选人播放指示线
+4. 修安卓不能正常退出
+5. 修不保存密码
+6. 修复技能失效bug，增加可令非锁定技失效的全局标记
+7. 修谋徐盛太脆皮bug
+8. 修神貂蝉bug
+9. 修弃牌阶段可以取消跳过bug
+10. 各种或小或大的优化
+11. hasMark标记为即将删除
+
+___
+
 ## v0.2.2
 
 1. 增加退出时确定

CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.2.2)
+project(FreeKill VERSION 0.2.3)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS

Fk/Pages/Room.qml

@@ -408,8 +408,10 @@ Item {
       anchors.rightMargin: 20
       color: "#88EEEEEE"
       radius: 8
-      visible: roomScene.state == "playing" && specialCardSkills && (specialCardSkills.count > 1
+      visible: roomScene.state === "playing" && (specialCardSkills ?? false)
-        || (specialCardSkills.model && specialCardSkills.model[0] !== "_normal_use"))
+        && (specialCardSkills.count > 1
+          || ((specialCardSkills.model ?? false)
+            && specialCardSkills.model[0] !== "_normal_use"))
       width: childrenRect.width
       height: childrenRect.height - 20
 
@@ -567,7 +569,7 @@ Item {
 
   Drawer {
     id: roomDrawer
-    width: parent.width * 0.3 / mainWindow.scale
+    width: roomScene.width * 0.3 / mainWindow.scale
     height: parent.height / mainWindow.scale
     dim: false
     clip: true

android/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.notify.FreeKill"
   android:installLocation="preferExternal"
-  android:versionCode="202"
+  android:versionCode="203"
-  android:versionName="0.2.2">
+  android:versionName="0.2.3">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

lua/client/i18n/zh_CN.lua

@@ -233,6 +233,23 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
 11. 处理区的牌增加脚注和转化牌牌名（未完全完善）
 12. askForChoices堆一个detailed参数以显示详情
 13. 武将一览界面上新播放语音
+
+___
+
+## v0.2.3
+
+啥也没干，光修bug去了
+
+1. 修事件记录器查询
+2. 修安卓没法退出
+3. 修某些秘密选人播放指示线
+4. 修安卓不能正常退出
+5. 修不保存密码
+6. 修复技能失效bug，增加可令非锁定技失效的全局标记
+7. 修谋徐盛太脆皮bug
+8. 修神貂蝉bug
+9. 修弃牌阶段可以取消跳过bug
+10. 各种或小或大的优化
   ]==],
 }
 

lua/core/card.lua

@@ -332,6 +332,7 @@ end
 ---@param mark string @ 标记
 ---@return boolean
 function Card:hasMark(mark)
+  fk.qWarning("hasMark will be deleted in future version!")
   return self:getMark(mark) ~= 0
 end
 

lua/core/player.lua

@@ -202,6 +202,7 @@ end
 ---@param mark string @ 标记
 ---@return boolean
 function Player:hasMark(mark)
+  fk.qWarning("hasMark will be deleted in future version!")
   return self:getMark(mark) ~= 0
 end
 

packages/test/init.lua

@@ -242,7 +242,19 @@ local change_hero = fk.CreateActiveSkill{
     room:changeHero(target, general, false, false, true)
   end,
 }
-local test2 = General(extension, "mouxusheng", "wu", 100, 100, General.Female)
+local test_zhenggong = fk.CreateTriggerSkill{
+  name = "test_zhenggong",
+  events = {fk.RoundStart},
+  frequency = Skill.Compulsory,
+  anim_type = "negative",
+  can_trigger = function(self, event, target, player, data)
+    return player:hasSkill(self.name) and player.room:getTag("RoundCount") == 1
+  end,
+  on_use = function(self, event, target, player, data)
+    player:gainAnExtraTurn()
+  end,
+}
+local test2 = General(extension, "mouxusheng", "wu", 99, 99, General.Female)
 test2.shield = 5
 test2:addSkill("rende")
 test2:addSkill(cheat)
@@ -251,6 +263,7 @@ test2:addSkill(test_vs)
 --test2:addSkill(test_trig)
 test2:addSkill(damage_maker)
 test2:addSkill(change_hero)
+test2:addSkill(test_zhenggong)
 
 Fk:loadTranslationTable{
   ["test_p_0"] = "测试包",
@@ -272,6 +285,9 @@ Fk:loadTranslationTable{
 
   ["change_hero"] = "变更",
   [":change_hero"] = "出牌阶段，你可以变更一名角色武将牌。",
+
+  ["test_zhenggong"] = "迅测",
+  [":test_zhenggong"] = "锁定技，首轮开始时，你执行额外的回合。",
 }
 
 return { extension }

src/core/packman.cpp

@@ -146,7 +146,7 @@ void PackMan::updatePack(const QString &pack) {
   int error;
   error = status(pack);
   if (error != 0) {
-    qCritical("Workspace is dirty, or some error occured.");
+    qCritical("packages/%s: Workspace is dirty, or some error occured.", pack.toLatin1().constData());
     return;
   }
   error = pull(pack);