Răsfoiți Sursa

3.6.28(7)提审
1.增加视频次数购买
2.增加 2 个视频特效

100Years 1 săptămână în urmă
părinte
comite
f5d4d60457

+ 10 - 2
AIEmoji.xcodeproj/project.pbxproj

@@ -273,6 +273,8 @@
 		A8D6384A2DB252F100A96C0E /* TSAIListHistoryBaseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8D638492DB252F000A96C0E /* TSAIListHistoryBaseCell.swift */; };
 		A8DFCDAF2E445C4E005A6D44 /* TSAIPhotoBrowsePageVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8DFCDAE2E445C4D005A6D44 /* TSAIPhotoBrowsePageVC.swift */; };
 		A8DFCDB22E45ECDE005A6D44 /* TSPurchaseManager+Judge.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8DFCDB12E45E9FA005A6D44 /* TSPurchaseManager+Judge.swift */; };
+		A8E60A272E4B0FEC00FC6A3E /* Drive My Ferrari.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A8E60A252E4B0FEC00FC6A3E /* Drive My Ferrari.mp4 */; };
+		A8E60A282E4B0FEC00FC6A3E /* Eat mushrooms.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A8E60A262E4B0FEC00FC6A3E /* Eat mushrooms.mp4 */; };
 		A8EB1A642E30EA24001F58D7 /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8EB1A632E30EA22001F58D7 /* KeychainManager.swift */; };
 		A8EB1A662E30FA78001F58D7 /* TSAppOtherAlertVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8EB1A652E30FA71001F58D7 /* TSAppOtherAlertVC.swift */; };
 		A8EB1AA02E320438001F58D7 /* Pixel World.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A8EB1A982E320438001F58D7 /* Pixel World.mp4 */; };
@@ -688,6 +690,8 @@
 		A8D638492DB252F000A96C0E /* TSAIListHistoryBaseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAIListHistoryBaseCell.swift; sourceTree = "<group>"; };
 		A8DFCDAE2E445C4D005A6D44 /* TSAIPhotoBrowsePageVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAIPhotoBrowsePageVC.swift; sourceTree = "<group>"; };
 		A8DFCDB12E45E9FA005A6D44 /* TSPurchaseManager+Judge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TSPurchaseManager+Judge.swift"; sourceTree = "<group>"; };
+		A8E60A252E4B0FEC00FC6A3E /* Drive My Ferrari.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Drive My Ferrari.mp4"; sourceTree = "<group>"; };
+		A8E60A262E4B0FEC00FC6A3E /* Eat mushrooms.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Eat mushrooms.mp4"; sourceTree = "<group>"; };
 		A8EB1A632E30EA22001F58D7 /* KeychainManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainManager.swift; sourceTree = "<group>"; };
 		A8EB1A652E30FA71001F58D7 /* TSAppOtherAlertVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAppOtherAlertVC.swift; sourceTree = "<group>"; };
 		A8EB1A852E320438001F58D7 /* Animal Diving Show.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Animal Diving Show.mp4"; sourceTree = "<group>"; };
@@ -1488,6 +1492,8 @@
 		A82542D52E279C4700F54FE5 /* Video */ = {
 			isa = PBXGroup;
 			children = (
+				A8E60A252E4B0FEC00FC6A3E /* Drive My Ferrari.mp4 */,
+				A8E60A262E4B0FEC00FC6A3E /* Eat mushrooms.mp4 */,
 				A8EB1ABB2E321E9B001F58D7 /* 360° Microwave.mp4 */,
 				A8EB1ABC2E321E9B001F58D7 /* Body Shake.mp4 */,
 				A8EB1ABD2E321E9B001F58D7 /* Kiss.mp4 */,
@@ -2838,6 +2844,8 @@
 				A8EEADE72D3E76860032C5A0 /* Drink🥤.json in Resources */,
 				A83404DB2D9D382200C140E4 /* AccentURW-Reg.ttf in Resources */,
 				A82D607D2DB7748800596190 /* ai_expand_image_style.json in Resources */,
+				A8E60A272E4B0FEC00FC6A3E /* Drive My Ferrari.mp4 in Resources */,
+				A8E60A282E4B0FEC00FC6A3E /* Eat mushrooms.mp4 in Resources */,
 				A8F413642DAA6F8C001E715A /* ai_change_hair_style.json in Resources */,
 				A80EDE082D700395003CD332 /* rotatingAnimation_1.gif in Resources */,
 				A83404FE2DA35BFE00C140E4 /* Localizable.strings in Resources */,
@@ -3288,7 +3296,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3327,7 +3335,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

+ 21 - 0
AIEmoji/Assets.xcassets/Discover/video/video_style_DriveMyFerrari.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "video_style_DriveMyFerrari.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
AIEmoji/Assets.xcassets/Discover/video/video_style_DriveMyFerrari.imageset/video_style_DriveMyFerrari.png


+ 21 - 0
AIEmoji/Assets.xcassets/Discover/video/video_style_Eatmushrooms.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "video_style_Eatmushrooms.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
AIEmoji/Assets.xcassets/Discover/video/video_style_Eatmushrooms.imageset/video_style_Eatmushrooms.png


+ 6 - 0
AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel+Data.swift

@@ -38,9 +38,15 @@ class TSDiscoverViewModel {
             TSDiscoverItemModel(style: .videoV2,
                                 viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Alien Kidnap.mp4"]),
                                 generateModel: TSGenerateModel(json: video_AlienKidnap)),
+            TSDiscoverItemModel(style: .videoV2,
+                                viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Drive My Ferrari.mp4"]),
+                                generateModel: TSGenerateModel(json: video_DriveMyFerrari)),
             TSDiscoverItemModel(style: .videoV2,
                                 viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Drive my yacht.mp4"]),
                                 generateModel: TSGenerateModel(json: video_DriveMyYacht)),
+            TSDiscoverItemModel(style: .videoV2,
+                                viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Eat mushrooms.mp4"]),
+                                generateModel: TSGenerateModel(json: video_Eatmushrooms)),
             TSDiscoverItemModel(style: .videoV2,
                                 viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Earth Zoom out.mp4"]),
                                 generateModel: TSGenerateModel(json: video_EarthZoomOut)),

+ 30 - 0
AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel+Dic.swift

@@ -167,7 +167,9 @@ extension TSDiscoverViewModel {
             //video
             
             TSGenerateModel(json: video_AlienKidnap),
+            TSGenerateModel(json: video_DriveMyFerrari),
             TSGenerateModel(json: video_DriveMyYacht),
+            TSGenerateModel(json: video_Eatmushrooms),
             TSGenerateModel(json: video_EarthZoomOut),
             TSGenerateModel(json: video_SuperMan),
             TSGenerateModel(json: video_BoxMe),
@@ -245,6 +247,34 @@ let videoUnionType = 2
 //MARK: video
 extension TSDiscoverViewModel {
     
+    var video_DriveMyFerrari:[String:Any]{
+        [
+            imageName: "video_style_DriveMyFerrari",
+            imageText: "Drive My Ferrari",
+            prompt:"",
+            template:"drive_ferrari",
+            specialStyle:0,
+            isVip: false,
+            unionType: videoUnionType,
+            hintType:2,
+            model:kie
+        ]
+    }
+    
+    var video_Eatmushrooms:[String:Any]{
+        [
+            imageName: "video_style_Eatmushrooms",
+            imageText: "Eat mushrooms",
+            prompt:"",
+            template:"eat_mushrooms",
+            specialStyle:0,
+            isVip: true,
+            unionType: videoUnionType,
+            hintType:3,
+            model:kie
+        ]
+    }
+    
     var video_Kiss:[String:Any]{
         [
             imageName: "video_style_Kiss",

BIN
AIEmoji/Res/Video/Drive My Ferrari.mp4


BIN
AIEmoji/Res/Video/Eat mushrooms.mp4


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

@@ -614,3 +614,6 @@
 "AI Videos" = "KI-Videos";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "Ungültiges Seitenverhältnis. Muss 1:2 bis 1:1,2 sein";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "Herzlichen Glückwunsch zu Ihrem Kauf! Sie haben %d Videoeffekt-Anwendungen. Jetzt ausprobieren!";
+"Leaving will cancel the generation and deduct one video effect use" = "Beim Verlassen wird die Generierung abgebrochen und ein Videoeffekt abgezogen";
+"Drive My Ferrari" = "Fahr meinen Ferrari";
+"Eat mushrooms" = "Pilze essen";

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

@@ -618,3 +618,6 @@ Small / Medium / Large: Manual amplitude selection ";
 "AI Videos" = "AI Videos";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "Invalid aspect ratio. Must be 1:2 to 1:1.2";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "Congratulations on your purchase! You have %d video effect uses. Try now!";
+"Leaving will cancel the generation and deduct one video effect use" = "Leaving will cancel the generation and deduct one video effect use";
+"Drive My Ferrari" = "Drive My Ferrari";
+"Eat mushrooms" = "Eat mushrooms";

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

@@ -612,3 +612,6 @@
 "AI Videos" = "Vídeos de IA";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "Relación de aspecto no válida. Debe ser de 1:2 a 1:1.2.";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "¡Felicitaciones por tu compra! Tienes %d usos de efectos de video. ¡Pruébalo ahora!";
+"Leaving will cancel the generation and deduct one video effect use" = "Salir cancelará la generación y deducirá el uso de un efecto de video.";
+"Drive My Ferrari" = "Conduce mi Ferrari";
+"Eat mushrooms" = "Come hongos";

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

@@ -611,3 +611,6 @@
 "AI Videos" = "AI ビデオ";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "アスペクト比が無効です。1:2~1:1.2 にする必要があります。";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "ご購入ありがとうございます!ビデオエフェクトの使用回数は%d回です。今すぐお試しください!";
+"Leaving will cancel the generation and deduct one video effect use" = "退出すると生成がキャンセルされ、ビデオエフェクトの使用回数が1回減算されます。";
+"Drive My Ferrari" = "フェラーリを運転する";
+"Eat mushrooms" = "キノコを食べる";

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

@@ -615,3 +615,6 @@
 "AI Videos" = "AI 비디오";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "잘못된 종횡비입니다. 1:2에서 1:1.2 사이여야 합니다.";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "구매를 축하드립니다! %d개의 비디오 효과를 사용하실 수 있습니다. 지금 사용해 보세요!";
+"Leaving will cancel the generation and deduct one video effect use" = "나가면 생성이 취소되고 비디오 효과 사용 횟수가 하나 차감됩니다.";
+"Drive My Ferrari" = "내 페라리를 운전해";
+"Eat mushrooms" = "버섯을 먹다";

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

@@ -611,3 +611,6 @@
 "AI Videos" = "AI Videos";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "Proporção de tela inválida. Deve ser de 1:2 a 1:1,2.";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "Parabéns pela sua compra! Você tem %d usos de efeitos de vídeo. Experimente agora!";
+"Leaving will cancel the generation and deduct one video effect use" = "Sair cancelará a geração e deduzirá um uso de efeito de vídeo";
+"Drive My Ferrari" = "Dirija minha Ferrari";
+"Eat mushrooms" = "Coma cogumelos";

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

@@ -610,3 +610,6 @@
 "AI Videos" = "AI Videos";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "Proporção de tela inválida. Deve ser de 1:2 a 1:1,2.";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "Parabéns pela sua compra! Você tem %d usos de efeitos de vídeo. Experimente agora!";
+"Leaving will cancel the generation and deduct one video effect use" = "Sair cancelará a geração e deduzirá um uso de efeito de vídeo";
+"Drive My Ferrari" = "Dirija minha Ferrari";
+"Eat mushrooms" = "Coma cogumelos";

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

@@ -613,3 +613,6 @@
 "AI Videos" = "AI 视频";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "宽高比错误,必须在 1:2 到 1:1.2 之间";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "恭喜您购买成功!您有 %d 次视频特效可用。快去试试吧~";
+"Leaving will cancel the generation and deduct one video effect use" = "离开将取消生成并扣除一次视频效果使用";
+"Drive My Ferrari" = "驾驶我的法拉利";
+"Eat mushrooms" = "吃蘑菇";

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

@@ -601,3 +601,6 @@
 "AI Videos" = "AI 視頻";
 "Invalid aspect ratio. Must be 1:2 to 1:1.2" = "寬高比錯誤,必須在 1:2 到 1:1.2 之間";
 "Congratulations on your purchase! You have %d video effect uses. Try now!" = "恭喜您購買成功! 您有 %d 次視頻特效可用。 快去試試吧~";
+"Leaving will cancel the generation and deduct one video effect use" = "離開將取消生成並扣除一次視頻效果使用";
+"Drive My Ferrari" = "駕駛我的法拉利";
+"Eat mushrooms" = "吃蘑菇";