3.6.29(1)增加 2 个视频特效

AIEmoji.xcodeproj/project.pbxproj

@@ -120,6 +120,8 @@
 		A80EDE022D6F1CCD003CD332 /* TSPTPGeneratorVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80EDE012D6F1CCB003CD332 /* TSPTPGeneratorVC.swift */; };
 		A80EDE062D6F3491003CD332 /* TSPTPBrowseVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80EDE052D6F3490003CD332 /* TSPTPBrowseVC.swift */; };
 		A80EDE082D700395003CD332 /* rotatingAnimation_1.gif in Resources */ = {isa = PBXBuildFile; fileRef = A80EDE072D700395003CD332 /* rotatingAnimation_1.gif */; };
+		A81111712E4F35DB00A5E232 /* Hair color.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A811116F2E4F35DB00A5E232 /* Hair color.mp4 */; };
+		A81111722E4F35DB00A5E232 /* Transform into an emoji.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A81111702E4F35DB00A5E232 /* Transform into an emoji.mp4 */; };
 		A81BECA32DD1EA1E005D06A2 /* TSGeneratorErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A81BECA22DD1EA18005D06A2 /* TSGeneratorErrorView.swift */; };
 		A81BECA62DD1EFAF005D06A2 /* TSGeneratorloadingContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A81BECA52DD1EF9E005D06A2 /* TSGeneratorloadingContentView.swift */; };
 		A81BECA82DD1F075005D06A2 /* TSGeneratoringAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A81BECA72DD1F071005D06A2 /* TSGeneratoringAnimationView.swift */; };
@@ -516,6 +518,8 @@
 		A80EDE012D6F1CCB003CD332 /* TSPTPGeneratorVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSPTPGeneratorVC.swift; sourceTree = "<group>"; };
 		A80EDE052D6F3490003CD332 /* TSPTPBrowseVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSPTPBrowseVC.swift; sourceTree = "<group>"; };
 		A80EDE072D700395003CD332 /* rotatingAnimation_1.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = rotatingAnimation_1.gif; sourceTree = "<group>"; };
+		A811116F2E4F35DB00A5E232 /* Hair color.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Hair color.mp4"; sourceTree = "<group>"; };
+		A81111702E4F35DB00A5E232 /* Transform into an emoji.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Transform into an emoji.mp4"; sourceTree = "<group>"; };
 		A81BECA22DD1EA18005D06A2 /* TSGeneratorErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSGeneratorErrorView.swift; sourceTree = "<group>"; };
 		A81BECA52DD1EF9E005D06A2 /* TSGeneratorloadingContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSGeneratorloadingContentView.swift; sourceTree = "<group>"; };
 		A81BECA72DD1F071005D06A2 /* TSGeneratoringAnimationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSGeneratoringAnimationView.swift; sourceTree = "<group>"; };
@@ -1492,6 +1496,8 @@
 		A82542D52E279C4700F54FE5 /* Video */ = {
 			isa = PBXGroup;
 			children = (
+				A811116F2E4F35DB00A5E232 /* Hair color.mp4 */,
+				A81111702E4F35DB00A5E232 /* Transform into an emoji.mp4 */,
 				A8E60A252E4B0FEC00FC6A3E /* Drive My Ferrari.mp4 */,
 				A8E60A262E4B0FEC00FC6A3E /* Eat mushrooms.mp4 */,
 				A8EB1ABB2E321E9B001F58D7 /* 360° Microwave.mp4 */,
@@ -2828,6 +2834,8 @@
 				A8EB1AB52E320438001F58D7 /* PUBG Winner Hit.mp4 in Resources */,
 				A8EB1AB62E320438001F58D7 /* Animal Diving Show.mp4 in Resources */,
 				A8EB1AB72E320438001F58D7 /* Toy Me.mp4 in Resources */,
+				A81111712E4F35DB00A5E232 /* Hair color.mp4 in Resources */,
+				A81111722E4F35DB00A5E232 /* Transform into an emoji.mp4 in Resources */,
 				A8EB1AB82E320438001F58D7 /* Oscar Gala.mp4 in Resources */,
 				A8EB1AB92E320438001F58D7 /* Walking with Beasts.mp4 in Resources */,
 				A8EB1ABA2E320438001F58D7 /* MuscleUp.mp4 in Resources */,
@@ -3296,7 +3304,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3312,7 +3320,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.28;
+				MARKETING_VERSION = 3.6.29;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3335,7 +3343,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3351,7 +3359,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.28;
+				MARKETING_VERSION = 3.6.29;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

AIEmoji/Assets.xcassets/Discover/video/video_style_ChangeHairColor.imageset/Contents.json

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

AIEmoji/Assets.xcassets/Discover/video/video_style_TransformIntoEmoji.imageset/Contents.json

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

AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel+Data.swift

@@ -18,6 +18,9 @@ class TSDiscoverViewModel {
             TSDiscoverItemModel(style: .videoV2,
                                 viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Animal Diving Show.mp4"]),
                                 generateModel: TSGenerateModel(json: video_AnimalDivingShow)),
+            TSDiscoverItemModel(style: .videoV2,
+                                viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Hair color.mp4"]),
+                                generateModel: TSGenerateModel(json: video_ChangeHairColor)),
             TSDiscoverItemModel(style: .videoV2,
                                 viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Oscar Gala.mp4"]),
                                 generateModel: TSGenerateModel(json: video_OscarGala)),
@@ -35,6 +38,9 @@ class TSDiscoverViewModel {
     lazy var videoEffectItems: [TSDiscoverItemModel] = {
         [
             /// Trending Video Effect
+            TSDiscoverItemModel(style: .videoV2,
+                                viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Transform into an emoji.mp4"]),
+                                generateModel: TSGenerateModel(json: video_TransformIntoEmoji)),
             TSDiscoverItemModel(style: .videoV2,
                                 viewModel: TSDiscoverAnimationItemVM(title: "", style: .video, imageNameds: ["Alien Kidnap.mp4"]),
                                 generateModel: TSGenerateModel(json: video_AlienKidnap)),

AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel+Dic.swift

@@ -165,6 +165,7 @@ extension TSDiscoverViewModel {
             TSGenerateModel(json: ageOld),
             
             //video
+            TSGenerateModel(json: video_TransformIntoEmoji),
             
             TSGenerateModel(json: video_AlienKidnap),
             TSGenerateModel(json: video_DriveMyFerrari),
@@ -211,7 +212,8 @@ extension TSDiscoverViewModel {
             TSGenerateModel(json: video_OscarGala),
             TSGenerateModel(json: video_AnimalDivingShow),
             
-          
+            
+            TSGenerateModel(json: video_ChangeHairColor),
 //            TSGenerateModel(json: video_PhotoAnimater),
         ]
         return array
@@ -247,6 +249,33 @@ let videoUnionType = 2
 //MARK: video
 extension TSDiscoverViewModel {
     
+    
+    var video_ChangeHairColor:[String:Any]{
+        [
+            imageName: "video_style_ChangeHairColor",
+            imageText: "Change hair color",
+            prompt:"",
+            template:"hair_color_change",
+            isVip: false,
+            unionType: videoUnionType,
+            hintType:2,
+            model:kie
+        ]
+    }
+    
+    var video_TransformIntoEmoji:[String:Any]{
+        [
+            imageName: "video_style_TransformIntoEmoji",
+            imageText: "Transform into an emoji",
+            prompt:"",
+            template:"emoji_figure",
+            isVip: true,
+            unionType: videoUnionType,
+            hintType:2,
+            model:kie
+        ]
+    }
+    
     var video_DriveMyFerrari:[String:Any]{
         [
             imageName: "video_style_DriveMyFerrari",

AIEmoji/de.lproj/Localizable.strings

@@ -617,3 +617,5 @@
 "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";
+"Change hair color" = "Haarfarbe ändern";
+"Transform into an emoji" = "Verwandle dich in ein Emoji";

AIEmoji/en.lproj/Localizable.strings

@@ -621,3 +621,5 @@ Small / Medium / Large: Manual amplitude selection ";
 "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";
+"Change hair color" = "Change hair color";
+"Transform into an emoji" = "Transform into an emoji";

AIEmoji/es.lproj/Localizable.strings

@@ -615,3 +615,5 @@
 "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";
+"Change hair color" = "Cambiar el color del cabello";
+"Transform into an emoji" = "Transformarse en un emoji";

AIEmoji/ja.lproj/Localizable.strings

@@ -614,3 +614,5 @@
 "Leaving will cancel the generation and deduct one video effect use" = "退出すると生成がキャンセルされ、ビデオエフェクトの使用回数が1回減算されます。";
 "Drive My Ferrari" = "フェラーリを運転する";
 "Eat mushrooms" = "キノコを食べる";
+"Change hair color" = "髪の色を変える";
+"Transform into an emoji" = "絵文字に変身";

AIEmoji/ko.lproj/Localizable.strings

@@ -618,3 +618,5 @@
 "Leaving will cancel the generation and deduct one video effect use" = "나가면 생성이 취소되고 비디오 효과 사용 횟수가 하나 차감됩니다.";
 "Drive My Ferrari" = "내 페라리를 운전해";
 "Eat mushrooms" = "버섯을 먹다";
+"Change hair color" = "머리색 변경";
+"Transform into an emoji" = "이모티콘으로 변환";

AIEmoji/pt-BR.lproj/Localizable.strings

@@ -614,3 +614,5 @@
 "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";
+"Change hair color" = "Mudar a cor do cabelo";
+"Transform into an emoji" = "Transforme-se em um emoji";

AIEmoji/pt-PT.lproj/Localizable.strings

@@ -613,3 +613,5 @@
 "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";
+"Change hair color" = "Mudar a cor do cabelo";
+"Transform into an emoji" = "Transforme-se em um emoji";

AIEmoji/zh-Hans.lproj/Localizable.strings

@@ -616,3 +616,5 @@
 "Leaving will cancel the generation and deduct one video effect use" = "离开将取消生成并扣除一次视频效果使用";
 "Drive My Ferrari" = "驾驶我的法拉利";
 "Eat mushrooms" = "吃蘑菇";
+"Change hair color" = "一键变发色";
+"Transform into an emoji" = "变成 Emoji 小人";

AIEmoji/zh-Hant.lproj/Localizable.strings

@@ -604,3 +604,5 @@
 "Leaving will cancel the generation and deduct one video effect use" = "離開將取消生成並扣除一次視頻效果使用";
 "Drive My Ferrari" = "駕駛我的法拉利";
 "Eat mushrooms" = "吃蘑菇";
+"Change hair color" = "一鍵變發色";
+"Transform into an emoji" = "變成Emoji小人";