Merge branch 'develop_PDFReaderProV4.6.0' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProV4.6.0

PDF Office/PDF Master/Class/Appearance/Color.xcassets/Purchase/KMPurchase_99A6B2.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xB2",
+          "green" : "0xA6",
+          "red" : "0x99"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x85",
+          "green" : "0x7F",
+          "red" : "0x7E"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -344,6 +344,10 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         let contactsUsRange = (fullString as NSString).range(of: contactsUs)
         let linkColor = NSColor(red: 73/255.0, green: 130/255.0, blue: 230/255.0, alpha: 1.0)
         let font = NSFont.SFProTextRegularFont(16.0) // 与普通文本相同的字体
+        attributedString.addAttributes([
+            .foregroundColor: NSColor(named: "KMPurchase_99A6B2") as Any,
+            .font: font
+        ], range: (fullString as NSString).range(of: fullString))
         attributedString.addAttributes([
             .foregroundColor: linkColor,
             .link: NSLocalizedString("https://www.pdfreaderpro.com/store?mode=edu", comment: ""),
@@ -354,7 +358,6 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             .link: NSLocalizedString("https://www.pdfreaderpro.com/vpp-purchase-program", comment: ""),
             .font: font
         ], range: contactsUsRange)
-        attributedString.addAttribute(.font, value: font, range: (fullString as NSString).range(of: fullString))
         privacyLabel.attributedStringValue = attributedString
 
         billInformationLabel.stringValue = NSLocalizedString("Billing Information", comment: "")
@@ -392,6 +395,10 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         let termsOfServiceRange = (fullString1 as NSString).range(of: termsOfService)
         let linkColor1 = NSColor(red: 73/255.0, green: 130/255.0, blue: 230/255.0, alpha: 1.0)
         let font1 = NSFont.SFProTextRegularFont(11.0) // 与普通文本相同的字体
+        attributedString1.addAttributes([
+            .foregroundColor: NSColor(named: "KMPurchase_99A6B2") as Any,
+            .font: font1
+        ], range: (fullString1 as NSString).range(of: fullString1))
         attributedString1.addAttributes([
             .foregroundColor: linkColor1,
             .link: NSLocalizedString("https://www.pdfreaderpro.com/privacy-policy", comment: ""),
@@ -402,7 +409,6 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             .link: NSLocalizedString("https://www.pdfreaderpro.com/terms_of_service", comment: ""),
             .font: font1
         ], range: termsOfServiceRange)
-        attributedString1.addAttribute(.font, value: font1, range: (fullString1 as NSString).range(of: fullString1))
         payExplainLabel.attributedStringValue = attributedString1
         
         paypalBuyNowLabel.stringValue = NSLocalizedString("Buy Now", comment: "")