新增几条公式，新增说说

windshadow233 · Feb 9, 2025 · 57b2b5a · 57b2b5a
1 parent eed65cd
commit 57b2b5a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/source/_data/cfop.yml b/source/_data/cfop.yml
@@ -47,7 +47,7 @@
     - algo: (R U' R' U') (R U' R' d) (R' U' R)
     - algo: (R' F R F') (R U' R' U) (R U' R' U2) (R U' R')
 - algo_type: F2L
-  algo_name: 非标态 F2L 或标态其他方向的解法
+  algo_name: 标态其他方向的解法 或 非标态 F2L
   page_name: 进阶 F2L
   id_prefix: f2l+
   algo_list:
@@ -56,8 +56,20 @@
     - algo: f R f'
     - algo: U' (r U' R' U) (R U r')
     - algo: U' (R B' r' U) (r B R')
+    - algo: (U r' U R) (U' R' U' r)
+    - algo: (U R' F) (r U' r' F' R)
+    - algo: (U R' U' R) (U' R' U' R)
     - algo: (R U2' R2' U') (R2 U' R')
     - algo: (R' U' R U) (R' U' R)
+    - algo: (R U)2 (R U' R' U' R')
+    - algo: (U R' U' R) (U' R' U) (R' F R F' R)
+    - algo: (R' F R U') (F' R U' R')
+    - algo: (R' U R U2') (R' U R' F) (R F' R)
+    - algo: (U' R U') (R2' F R F') (R U' R')
+    - algo: (R' U2 R U') (R' U' R U') (R' U R)
+    - algo: (r U' r' U2') (r U r')
+    - algo: (R' F R F') (R U' R' U) (R U' R')
+
     - algo: U (R' F) (R2 U' R' U2') F'
     - algo: U (R' F R F') (R' U' R)
     - algo: F R' U R F'
@@ -70,12 +82,6 @@
     - algo: R2 U' R2' U R2
     - algo: R2' U R2 U' R2'
     - algo: R' u' R' u R
-    - algo: (U r' U R) (U' R' U' r)
-    - algo: (U R' F) (r U' r' F') R
-    - algo: (R U)2 (R U' R' U' R')
-    - algo: (U R' U' R) (U' R' U) (R' F R F' R)
-    - algo: (R' F R U') (F' R U' R')
-    - algo: (R' U R U2') (R' U R' F) (R F' R)
 - algo_type: OLL
   algo_name: OLL (Orientation of the Last Layer)
   page_name: OLL
@@ -133,6 +139,7 @@
     - algo: r2' D' (r U r' D) (r2 U' r' U' r)
     - algo: r' D' (r U' r' D) r2 U' (r' U r U r')
     - algo: F (U R U') (R2' F' R) (U R U' R')
+    - algo: F (U R U2') (R' U' R U R') F'
     - algo: (R' F) (R U R' F' R) y' (R U' R')
     - algo: (r U r') (R U R' U') (r U' r')
     - algo: (r' U' r) (R' U' R U) (r' U r)

diff --git a/source/_data/talk.yml b/source/_data/talk.yml
@@ -7,6 +7,10 @@
   limit: 30
   top_background: https://blogfiles.oss.fyz666.xyz/webp/70061b93-acea-4a1a-9111-df81571199ed.webp
   talk_list:
+    - content: 三步十字 + 跳o，喜破最近的 PB～
+      date: 2025/02/08 15:22
+      image:
+        - https://blogfiles.oss.fyz666.xyz/png/11e968d2-285d-4a31-801f-06233161cd09.png
     - content: 我这个快 10 年没玩魔方的老魔友经过一段时间的“复健”后，浅浅测了个速，似乎比以前要变强了一些。（其中有一把转错了最后一个公式导致 DNF 的被我删了嘿嘿。
         对于我这个老年人手速以及瞎子一般的观察预判能力而言真是不容易（争取早日 sub15！
       date: 2025/02/06 12:09