【合并】登录后无法合并修复

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/Source/KMCompatative.xcassets/remove watermark.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "remove watermark.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/Source/KMCompatative.xcassets/remove watermark.imageset/remove watermark.pdf

@@ -7,7 +7,7 @@
      /FunctionType 4
   >>
 stream
-{  0.312500 exch 0.463750 exch 1.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.107108 mul 0.312500 add exch dup 0.000000 sub 0.180172 mul 0.463750 add exch dup 0.000000 sub -0.019608 mul 1.000000 add exch } if dup 1.000000 gt { exch pop exch pop exch pop 0.419608 exch 0.643922 exch 0.980392 exch } if pop }
+{  0.414080 exch 0.395312 exch 0.958333 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.309087 mul 0.414080 add exch dup 0.000000 sub -0.024479 mul 0.395312 add exch dup 0.000000 sub 0.041667 mul 0.958333 add exch } if dup 1.000000 gt { exch pop exch pop exch pop 0.723167 exch 0.370833 exch 1.000000 exch } if pop }
 endstream
 endobj
 
@@ -16,7 +16,7 @@ endobj
 endobj
 
 3 0 obj
-  << /Pattern << /P1 << /Matrix [ 17.399105 -18.357592 18.357592 17.399105 -7.573900 9.163639 ]
+  << /Pattern << /P1 << /Matrix [ 17.289862 -7.466401 7.466401 17.289862 5.729766 9.966242 ]
                         /Shading << /Coords [ 0.000000 0.000000 1.000000 0.000000 ]
                                     /ColorSpace /DeviceRGB
                                     /Function 1 0 R
@@ -35,27 +35,27 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-1.000000 0.000000 -0.000000 1.000000 8.000000 6.252075 cm
+1.000000 0.000000 -0.000000 1.000000 8.000000 6.252197 cm
 /Pattern cs
 /P1 scn
-20.000000 9.409721 m
-20.000000 8.078160 19.665043 6.817276 19.067095 5.692083 c
-5.519455 18.515961 l
-7.127116 20.445585 8.765280 22.052492 9.698698 22.926748 c
-10.146873 23.346518 10.821943 23.356161 11.280507 22.947765 c
-13.573334 20.905779 20.000000 14.709504 20.000000 9.409721 c
+20.000000 9.409599 m
+20.000000 8.078038 19.665043 6.817154 19.067095 5.691961 c
+5.519455 18.515839 l
+7.127116 20.445463 8.765280 22.052370 9.698698 22.926626 c
+10.146873 23.346395 10.821943 23.356039 11.280507 22.947643 c
+13.573334 20.905657 20.000000 14.709382 20.000000 9.409599 c
 h
-2.449738 14.146850 m
-0.442254 16.047087 l
--0.147419 16.605257 -0.147417 17.510231 0.442256 18.068401 c
-1.031929 18.626572 1.987979 18.626572 2.577653 18.068401 c
-18.826254 2.687859 l
-19.415926 2.129686 19.415924 1.224714 18.826252 0.666542 c
-18.236578 0.108372 17.280527 0.108372 16.690855 0.666542 c
-15.294358 1.988434 l
-13.881817 1.238922 12.236346 0.809141 10.479762 0.809141 c
-5.221880 0.809141 0.959524 4.659752 0.959524 9.409721 c
-0.959524 10.898039 1.555729 12.532537 2.449738 14.146850 c
+2.449738 14.146728 m
+0.442254 16.046965 l
+-0.147419 16.605135 -0.147417 17.510109 0.442256 18.068279 c
+1.031929 18.626450 1.987979 18.626450 2.577653 18.068279 c
+18.826254 2.687737 l
+19.415926 2.129564 19.415924 1.224592 18.826252 0.666420 c
+18.236578 0.108250 17.280527 0.108250 16.690855 0.666420 c
+15.294358 1.988312 l
+13.881817 1.238800 12.236346 0.809019 10.479762 0.809019 c
+5.221880 0.809019 0.959524 4.659630 0.959524 9.409599 c
+0.959524 10.897917 1.555729 12.532415 2.449738 14.146728 c
 h
 f*
 n
@@ -119,16 +119,16 @@ xref
 0000000010 00000 n
 0000000531 00000 n
 0000000553 00000 n
-0000001179 00000 n
-0000002718 00000 n
-0000002741 00000 n
-0000002914 00000 n
-0000002988 00000 n
+0000001176 00000 n
+0000002715 00000 n
+0000002738 00000 n
+0000002911 00000 n
+0000002985 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 8 0 R
    /Size 9
 >>
 startxref
-3047
+3044
 %%EOF

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -1751,6 +1751,9 @@ static NSInteger kKMMergeCountMax = 2;
 #if VERSION_DMG
     return NO;
 #else
+    if ([KMLightMemberManager manager].isLogin) {
+        return NO;
+    }
     NSInteger cnt = [self getMergeCount];
     if (cnt >= kKMMergeCountMax) {
         return YES;