Browse Source

开发:3.6.16(2)

100Years 1 week ago
parent
commit
f473e55f27

+ 2 - 2
AIEmoji.xcodeproj/project.pbxproj

@@ -2544,7 +2544,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2583,7 +2583,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				GENERATE_INFOPLIST_FILE = YES;

BIN
AIEmoji/Assets.xcassets/PTP/style/ptp_style_3D.imageset/ptp_style_3D@2x.png


BIN
AIEmoji/Assets.xcassets/PTP/style/ptp_style_3D.imageset/ptp_style_3D@3x.png


BIN
AIEmoji/Assets.xcassets/PTP/style/ptp_style_Bikini.imageset/ptp_style_Bikini@2x.png


BIN
AIEmoji/Assets.xcassets/PTP/style/ptp_style_Bikini.imageset/ptp_style_Bikini@3x.png


+ 2 - 2
AIEmoji/Assets.xcassets/PTP/style/ptp_style_Bikini.imageset/Contents.json → AIEmoji/Assets.xcassets/PTP/style/ptp_style_PlushPillow.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "ptp_style_Bikini@2x.png",
+      "filename" : "ptp_style_PlushPillow@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "ptp_style_Bikini@3x.png",
+      "filename" : "ptp_style_PlushPillow@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

BIN
AIEmoji/Assets.xcassets/PTP/style/ptp_style_PlushPillow.imageset/ptp_style_PlushPillow@2x.png


BIN
AIEmoji/Assets.xcassets/PTP/style/ptp_style_PlushPillow.imageset/ptp_style_PlushPillow@3x.png


+ 1 - 1
AIEmoji/Base.lproj/LaunchScreen.storyboard

@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch.png" translatesAutoresizingMaskIntoConstraints="NO" id="xfk-nW-LaM">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch.png" translatesAutoresizingMaskIntoConstraints="NO" id="xfk-nW-LaM">
                                 <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                                 <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                             </imageView>
                             </imageView>
                         </subviews>
                         </subviews>

+ 4 - 1
AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -152,6 +152,9 @@ public class PurchaseManager: NSObject {
     public var isOverTotalTimes: Bool {
     public var isOverTotalTimes: Bool {
         if isVip {
         if isVip {
             loadTotalUse()
             loadTotalUse()
+            //#if DEBUG
+            //        return false
+            //#endif
             return totalUsedTimes >= vipType.freeNumber
             return totalUsedTimes >= vipType.freeNumber
         }
         }
         return false
         return false
@@ -215,7 +218,7 @@ public class PurchaseManager: NSObject {
 
 
     public var vipType: PremiumPeriod {
     public var vipType: PremiumPeriod {
 #if DEBUG
 #if DEBUG
-        return PremiumPeriod.none
+        return PremiumPeriod.year
 #endif
 #endif
         guard isVip, let type = vipInformation["type"] as? String else {
         guard isVip, let type = vipInformation["type"] as? String else {
             return .none
             return .none

+ 8 - 8
AIEmoji/Res/photo_to_photo_style.json

@@ -55,7 +55,7 @@
     {
     {
         "imageName": "ptp_style_Muscle",
         "imageName": "ptp_style_Muscle",
         "imageText": "Muscle",
         "imageText": "Muscle",
-        "prompt":"Add muscle effects to people in uploaded photos",
+        "prompt":"Realistic muscle enhancement, preserving original facial features and gender, natural body proportions, detailed anatomical structure (clear abs, biceps, pectorals), seamless skin/texture blending, clothing adaptation",
         "specialStyle":0,
         "specialStyle":0,
         "styleId": "",
         "styleId": "",
         "isVip": true,
         "isVip": true,
@@ -133,14 +133,13 @@
         "advance":true
         "advance":true
     },
     },
     {
     {
-        "imageName": "ptp_style_Bikini",
-        "imageText": "Bikini",
-        "prompt":"Turn clothes into bikinis based on the characters in the pictures.",
+        "imageName": "ptp_style_PlushPillow",
+        "imageText": "Plush Pillow",
+        "prompt":"Plush style illustration of the uploaded photo, plush doll look, stitched fabric edges, cartoon-style face,  pillow-shaped",
         "specialStyle":0,
         "specialStyle":0,
         "isVip": true,
         "isVip": true,
         "styleId": "",
         "styleId": "",
-        "advance":false,
-        "model":"flux"
+        "advance":true
     },
     },
     {
     {
         "imageName": "ptp_style_CibiMarukoChan",
         "imageName": "ptp_style_CibiMarukoChan",
@@ -484,10 +483,11 @@
     {
     {
         "imageName": "ptp_style_3D",
         "imageName": "ptp_style_3D",
         "imageText": "3D",
         "imageText": "3D",
-        "prompt":"把图片变成 Pixar 风格",
+        "prompt":"Please create image in Pixar style",
         "specialStyle":0,
         "specialStyle":0,
         "styleId": "ImageToImage-12",
         "styleId": "ImageToImage-12",
-        "isVip": true
+        "isVip": true,
+        "advance":true
     },
     },
     {
     {
         "imageName": "ptp_style_Pixel",
         "imageName": "ptp_style_Pixel",

+ 1 - 0
AIEmoji/de.lproj/Localizable.strings

@@ -422,3 +422,4 @@
 "Muscle" = "Muskel";
 "Muscle" = "Muskel";
 "Bikini" = "Bikini";
 "Bikini" = "Bikini";
 "Sailor Moon" = "Sailor Moon";
 "Sailor Moon" = "Sailor Moon";
+"Plush Pillow" = "Plüschkissen";

+ 1 - 0
AIEmoji/en.lproj/Localizable.strings

@@ -419,3 +419,4 @@
 "Muscle" = "Muscle";
 "Muscle" = "Muscle";
 "Bikini" = "Bikini";
 "Bikini" = "Bikini";
 "Sailor Moon" = "Sailor";
 "Sailor Moon" = "Sailor";
+"Plush Pillow" = "Plush Pillow";

+ 1 - 0
AIEmoji/es.lproj/Localizable.strings

@@ -419,3 +419,4 @@
 "Muscle" = "Músculo";
 "Muscle" = "Músculo";
 "Bikini" = "Bikini";
 "Bikini" = "Bikini";
 "Sailor Moon" = "Marinero Luna";
 "Sailor Moon" = "Marinero Luna";
+"Plush Pillow" = "Almohada de peluche";

+ 1 - 0
AIEmoji/ja.lproj/Localizable.strings

@@ -418,3 +418,4 @@
 "Muscle" = "筋";
 "Muscle" = "筋";
 "Bikini" = "ビキニ";
 "Bikini" = "ビキニ";
 "Sailor Moon" = "セーラームーン";
 "Sailor Moon" = "セーラームーン";
+"Plush Pillow" = "ぬいぐるみ枕";

+ 1 - 0
AIEmoji/ko.lproj/Localizable.strings

@@ -424,3 +424,4 @@
 "Muscle" = "근";
 "Muscle" = "근";
 "Bikini" = "비키니";
 "Bikini" = "비키니";
 "Sailor Moon" = "세일러문";
 "Sailor Moon" = "세일러문";
+"Plush Pillow" = "플러시 베개";

+ 1 - 0
AIEmoji/pt-BR.lproj/Localizable.strings

@@ -418,3 +418,4 @@
 "Muscle" = "Músculo";
 "Muscle" = "Músculo";
 "Bikini" = "Bikini";
 "Bikini" = "Bikini";
 "Sailor Moon" = "Sailor Moon";
 "Sailor Moon" = "Sailor Moon";
+"Plush Pillow" = "Travesseiro de pelúcia";

+ 1 - 0
AIEmoji/pt-PT.lproj/Localizable.strings

@@ -418,3 +418,4 @@
 "Muscle" = "Músculo";
 "Muscle" = "Músculo";
 "Bikini" = "Bikini";
 "Bikini" = "Bikini";
 "Sailor" = "Sailor Moon";
 "Sailor" = "Sailor Moon";
+"Plush Pillow" = "Travesseiro de pelúcia";

+ 1 - 0
AIEmoji/zh-Hans.lproj/Localizable.strings

@@ -420,3 +420,4 @@
 "Muscle" = "肌肉";
 "Muscle" = "肌肉";
 "Bikini" = "比基尼";
 "Bikini" = "比基尼";
 "Sailor Moon" = "美少女战士";
 "Sailor Moon" = "美少女战士";
+"Plush Pillow" = "毛绒枕头";

+ 1 - 0
AIEmoji/zh-Hant.lproj/Localizable.strings

@@ -410,3 +410,4 @@
 "Muscle" = "肌肉";
 "Muscle" = "肌肉";
 "Bikini" = "比基尼";
 "Bikini" = "比基尼";
 "Sailor Moon" = "美少女戰士";
 "Sailor Moon" = "美少女戰士";
+"Plush Pillow" = "毛絨枕頭";