diff --git a/.vscode/settings.json b/.vscode/settings.json index f765eef..eb9078f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "dotnet.defaultSolution": "Kill.sln", + "dotnet.dotnetPath": "C:/Program Files/dotnet/dotnet.exe", "dotrush.roslyn.dotnetSdkDirectory": "C:/Program Files/dotnet/sdk/8.0.113", "dotrush.msbuildProperties": { "DefineConstants": "UNITY_EDITOR" diff --git a/Assets/Plugins/Android/Exceptions.java b/Assets/Plugins/Android/Exceptions.java new file mode 100644 index 0000000..40a5908 --- /dev/null +++ b/Assets/Plugins/Android/Exceptions.java @@ -0,0 +1,40 @@ +package com.arthenica.smartexception.java; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * smartexception-java 的最小 stub + * ffmpeg-kit 6.0.2 内部 swordfish 库依赖此类的 getStackTraceString / registerRootPackage + * 我们不需要完整功能,只需保证类存在且方法签名匹配 + */ +public class Exceptions { + + private static final Set rootPackages = Collections.synchronizedSet(new HashSet()); + + public static void registerRootPackage(String rootPackage) { + if (rootPackage != null) { + rootPackages.add(rootPackage); + } + } + + public static String[] getRegisteredRootPackages() { + return rootPackages.toArray(new String[0]); + } + + public static void unregisterRootPackage(String rootPackage) { + if (rootPackage != null) { + rootPackages.remove(rootPackage); + } + } + + public static String getStackTraceString(Throwable t) { + if (t == null) return ""; + StringWriter sw = new StringWriter(); + t.printStackTrace(new PrintWriter(sw)); + return sw.toString(); + } +} diff --git a/Assets/Plugins/Android/Exceptions.java.meta b/Assets/Plugins/Android/Exceptions.java.meta new file mode 100644 index 0000000..1eec5e5 --- /dev/null +++ b/Assets/Plugins/Android/Exceptions.java.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 24b172d3926ad8942a95e2682e783122 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs.meta b/Assets/Plugins/Android/jniLibs.meta new file mode 100644 index 0000000..39a3c64 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bf7b13fff88f954e8e20570135aa4fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a.meta new file mode 100644 index 0000000..4bf18a4 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df7805ab2d3b7ee4f96106672813ac91 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavcodec.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavcodec.so new file mode 100644 index 0000000..f74dcc7 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavcodec.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavcodec.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavcodec.so.meta new file mode 100644 index 0000000..d40843c --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavcodec.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: fa7f8d684f49aed42bee73ba831c14e3 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavdevice.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavdevice.so new file mode 100644 index 0000000..b524071 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavdevice.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavdevice.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavdevice.so.meta new file mode 100644 index 0000000..f361a9e --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavdevice.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 127b1ca475d6c2c4baeba9d0a82ba22f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavfilter.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavfilter.so new file mode 100644 index 0000000..5d9f423 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavfilter.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavfilter.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavfilter.so.meta new file mode 100644 index 0000000..49f839b --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavfilter.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 216200a08ba02c84a84097cf5d35beeb +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavformat.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavformat.so new file mode 100644 index 0000000..e5bc2e1 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavformat.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavformat.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavformat.so.meta new file mode 100644 index 0000000..089cb0e --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavformat.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 7650b1a65f114ef42bcdbe9917e8184e +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavutil.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavutil.so new file mode 100644 index 0000000..3ebce08 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavutil.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libavutil.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavutil.so.meta new file mode 100644 index 0000000..bf5da02 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libavutil.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 7f3a4d77039e3924b93d7d5f41bea59f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libc++_shared.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libc++_shared.so new file mode 100644 index 0000000..eb3b8fc Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libc++_shared.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libc++_shared.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libc++_shared.so.meta new file mode 100644 index 0000000..0be4741 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libc++_shared.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 6dbc173a359c19e4f93988bd069836e5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: false + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit.so new file mode 100644 index 0000000..20b5b63 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit.so.meta new file mode 100644 index 0000000..2723fa9 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 6c879c557a252f94c809b6e4e11e1d8f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit_abidetect.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit_abidetect.so new file mode 100644 index 0000000..5962dd7 Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit_abidetect.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit_abidetect.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit_abidetect.so.meta new file mode 100644 index 0000000..61a2e1b --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libffmpegkit_abidetect.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c79917e539e4a084fbe78be71658249a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libswresample.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswresample.so new file mode 100644 index 0000000..246fb8c Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswresample.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libswresample.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswresample.so.meta new file mode 100644 index 0000000..d7feae9 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswresample.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 4366edb3a69081d499c29a18976d20e2 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libswscale.so b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswscale.so new file mode 100644 index 0000000..98aecfe Binary files /dev/null and b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswscale.so differ diff --git a/Assets/Plugins/Android/jniLibs/arm64-v8a/libswscale.so.meta b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswscale.so.meta new file mode 100644 index 0000000..e9619d2 --- /dev/null +++ b/Assets/Plugins/Android/jniLibs/arm64-v8a/libswscale.so.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: fda05a6417969af418657b2bc27116e8 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARM64 + Is16KbAligned: true + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/libs.meta b/Assets/Plugins/Android/libs.meta new file mode 100644 index 0000000..ab7b68b --- /dev/null +++ b/Assets/Plugins/Android/libs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7a31c1ff4b90e64eace12948fd1b59d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/libs/ffmpeg-kit-classes.jar b/Assets/Plugins/Android/libs/ffmpeg-kit-classes.jar new file mode 100644 index 0000000..ac7aa1e Binary files /dev/null and b/Assets/Plugins/Android/libs/ffmpeg-kit-classes.jar differ diff --git a/Assets/Plugins/Android/libs/ffmpeg-kit-classes.jar.meta b/Assets/Plugins/Android/libs/ffmpeg-kit-classes.jar.meta new file mode 100644 index 0000000..88d7cac --- /dev/null +++ b/Assets/Plugins/Android/libs/ffmpeg-kit-classes.jar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: d3f31159fe0fd444ca012e3a92066482 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 5fb72af..0176898 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -1,8 +1,16 @@ apply plugin: 'com.android.library' **APPLY_PLUGINS** +repositories { + mavenCentral() + google() +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + // 提取的 ffmpeg-kit classes.jar(避免 Unity 处理 aar 不解压出 classes 的问题) + implementation files('libs/ffmpeg-kit-classes.jar') + // jniLibs .so 走 Plugins/Android/jniLibs/ 标准路径,Unity 自动复制到 APK // Android Resolver Dependencies Start implementation 'com.google.android.gms:play-services-base:18.10.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:17 // implementation 'com.google.firebase:firebase-analytics:23.0.0' // Assets/Firebase/Editor/AnalyticsDependencies.xml:13 diff --git a/Assets/Plugins/Android/proguard-user.txt b/Assets/Plugins/Android/proguard-user.txt index a626f74..0e2456a 100644 --- a/Assets/Plugins/Android/proguard-user.txt +++ b/Assets/Plugins/Android/proguard-user.txt @@ -3,3 +3,9 @@ # 保留 FilePicker 插件类（通过 AndroidJavaClass 反射调用，R8 无法检测到使用） -keep class com.unity.filepicker.** { *; } + +# 保留 ffmpeg-kit 全部类(R8 混淆后 ffmpeg-kit 内部 native 调用会失效) +-keep class com.arthenica.ffmpegkit.** { *; } +-keep class com.arthenica.ffmpegkit.**$* { *; } +# 保留 smartexception stub(ffmpeg-kit 内部 swordfish 依赖) +-keep class com.arthenica.smartexception.java.** { *; } diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json index b1539d0..96ca835 100644 --- a/Assets/Res/language/language.json +++ b/Assets/Res/language/language.json @@ -1294,6 +1294,11 @@ "zh": "下载", "en": "Download" }, + { + "key": "save_to_album", + "zh": "保存到相册", + "en": "Save to album" + }, { "key": "100257", "zh": "已保存到相册", diff --git a/Assets/Res/ui/common/texture/白色下载.png b/Assets/Res/ui/common/texture/白色下载.png new file mode 100644 index 0000000..281ff35 Binary files /dev/null and b/Assets/Res/ui/common/texture/白色下载.png differ diff --git a/Assets/Res/ui/common/texture/白色下载.png.meta b/Assets/Res/ui/common/texture/白色下载.png.meta new file mode 100644 index 0000000..b92a464 --- /dev/null +++ b/Assets/Res/ui/common/texture/白色下载.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c229daec576184744b211d6dba64b86d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/ui/videopage/videoPage.prefab b/Assets/Res/ui/videopage/videoPage.prefab index 5a8c801..1aaa43f 100644 --- a/Assets/Res/ui/videopage/videoPage.prefab +++ b/Assets/Res/ui/videopage/videoPage.prefab @@ -1555,8 +1555,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 33.30693, y: -25} - m_SizeDelta: {x: 11.485148, y: 32.158413} + m_AnchoredPosition: {x: 34, y: -25} + m_SizeDelta: {x: 12, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7651326578310032666 CanvasRenderer: @@ -1634,8 +1634,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 70.0594, y: -25} - m_SizeDelta: {x: 62.0198, y: 32.158413} + m_AnchoredPosition: {x: 71, y: -25} + m_SizeDelta: {x: 62, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5439455909549482936 CanvasRenderer: @@ -1713,8 +1713,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 13.782178, y: -25} - m_SizeDelta: {x: 27.564356, y: 32.158413} + m_AnchoredPosition: {x: 14, y: -25} + m_SizeDelta: {x: 28, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9138258466124955313 CanvasRenderer: @@ -2407,7 +2407,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 268.099, y: -45} + m_AnchoredPosition: {x: 263.5, y: -45} m_SizeDelta: {x: 48, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1825978237086955098 @@ -2438,7 +2438,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d683593328a0cd1439ec851b678d6e53, type: 3} + m_Sprite: {fileID: 21300000, guid: 2a30eeb1d11a4c54ab247ce04ff970dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3199,8 +3199,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 385.0099, y: -45} - m_SizeDelta: {x: 137.82178, y: 90} + m_AnchoredPosition: {x: 381, y: -45} + m_SizeDelta: {x: 139, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3173438462998470296 CanvasRenderer: @@ -3256,7 +3256,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} m_Name: m_EditorClassIdentifier: - textKey: 100256 + textKey: save_to_album --- !u!1 &9076327582970621402 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res/ui/videopage/一条视频.prefab b/Assets/Res/ui/videopage/一条视频.prefab index 5bf103a..71b3eae 100644 --- a/Assets/Res/ui/videopage/一条视频.prefab +++ b/Assets/Res/ui/videopage/一条视频.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &497558733087982060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5882713478833418639} + - component: {fileID: 1036065137287717569} + - component: {fileID: 367163259704343791} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5882713478833418639 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497558733087982060} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9188773615237041945} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: 0} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1036065137287717569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497558733087982060} + m_CullTransparentMesh: 1 +--- !u!114 &367163259704343791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497558733087982060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &877347991771310610 GameObject: m_ObjectHideFlags: 0 @@ -79,6 +154,202 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &2051001936009020673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4673987278082270048} + - component: {fileID: 5362905219182314851} + - component: {fileID: 2535855211290697476} + m_Layer: 5 + m_Name: fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4673987278082270048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051001936009020673} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8623461907935592638} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 56, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5362905219182314851 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051001936009020673} + m_CullTransparentMesh: 1 +--- !u!114 &2535855211290697476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051001936009020673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0c71bc27e9a8003489c4ecac25d77cf7, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2132022660410915657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 636836731591056723} + - component: {fileID: 3523228025851238942} + - component: {fileID: 4899917637513757111} + - component: {fileID: 9005445394137887220} + m_Layer: 5 + m_Name: "\u4E0B\u8F7D" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &636836731591056723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132022660410915657} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9065212358823370560} + m_Father: {fileID: 68797095166843205} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -24, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &3523228025851238942 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132022660410915657} + m_CullTransparentMesh: 1 +--- !u!114 &4899917637513757111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132022660410915657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c229daec576184744b211d6dba64b86d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9005445394137887220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132022660410915657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4899917637513757111} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3598736706289518838 GameObject: m_ObjectHideFlags: 0 @@ -91,7 +362,6 @@ GameObject: - component: {fileID: 5299248103163038637} - component: {fileID: 2175641447419279724} - component: {fileID: 9151980594487127953} - - component: {fileID: 6414481814838801359} m_Layer: 5 m_Name: "\u4E00\u6761\u89C6\u9891" m_TagString: Untagged @@ -114,6 +384,8 @@ RectTransform: - {fileID: 3798966534521417101} - {fileID: 7265590296071766734} - {fileID: 9188773615237041945} + - {fileID: 636836731591056723} + - {fileID: 8623461907935592638} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -174,50 +446,11 @@ MonoBehaviour: timeText: {fileID: 4285570928671144042} videoImage: {fileID: 7879863914677697422} data: {fileID: 4035548829646174203} ---- !u!114 &6414481814838801359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3598736706289518838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2175641447419279724} - m_OnClick: - m_PersistentCalls: - m_Calls: [] + downloadButton: {fileID: 9005445394137887220} + playButton: {fileID: 8721096871482888230} + loadingImage: {fileID: 293915980322065354} + fillLoadingImage: {fileID: 2535855211290697476} + videoUrl: --- !u!1 &4411859370997722127 GameObject: m_ObjectHideFlags: 0 @@ -229,8 +462,9 @@ GameObject: - component: {fileID: 9188773615237041945} - component: {fileID: 6119825987542687625} - component: {fileID: 7879863914677697422} + - component: {fileID: 8721096871482888230} m_Layer: 5 - m_Name: "\u9884\u89C8\u56FE" + m_Name: "\u64AD\u653E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -247,7 +481,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5882713478833418639} m_Father: {fileID: 68797095166843205} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} @@ -293,6 +528,125 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8721096871482888230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4411859370997722127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7879863914677697422} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &5010573327037882523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9065212358823370560} + - component: {fileID: 5849985704768591495} + - component: {fileID: 887128703327512524} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9065212358823370560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010573327037882523} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 636836731591056723} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: 0} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5849985704768591495 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010573327037882523} + m_CullTransparentMesh: 1 +--- !u!114 &887128703327512524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010573327037882523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7520780073196005562 GameObject: m_ObjectHideFlags: 0 @@ -372,3 +726,79 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1.3 m_Text: +--- !u!1 &8869706884894642105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8623461907935592638} + - component: {fileID: 5473811544253790937} + - component: {fileID: 293915980322065354} + m_Layer: 5 + m_Name: "\u8FDB\u5EA6" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8623461907935592638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869706884894642105} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4673987278082270048} + m_Father: {fileID: 68797095166843205} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -24, y: 0} + m_SizeDelta: {x: 56, y: 56} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &5473811544253790937 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869706884894642105} + m_CullTransparentMesh: 1 +--- !u!114 &293915980322065354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869706884894642105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 85008df8bc29d934bad661ef65c1943c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Res/ui/videopage/保存到相册.png b/Assets/Res/ui/videopage/保存到相册.png new file mode 100644 index 0000000..51eab7c Binary files /dev/null and b/Assets/Res/ui/videopage/保存到相册.png differ diff --git a/Assets/Res/ui/videopage/保存到相册.png.meta b/Assets/Res/ui/videopage/保存到相册.png.meta new file mode 100644 index 0000000..4ad9354 --- /dev/null +++ b/Assets/Res/ui/videopage/保存到相册.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2a30eeb1d11a4c54ab247ce04ff970dc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/ui/videopage/进度条.png b/Assets/Res/ui/videopage/进度条.png new file mode 100644 index 0000000..c8e3451 Binary files /dev/null and b/Assets/Res/ui/videopage/进度条.png differ diff --git a/Assets/Res/ui/videopage/进度条.png.meta b/Assets/Res/ui/videopage/进度条.png.meta new file mode 100644 index 0000000..d73e8f7 --- /dev/null +++ b/Assets/Res/ui/videopage/进度条.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0c71bc27e9a8003489c4ecac25d77cf7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/ui/videopage/进度条底色.png b/Assets/Res/ui/videopage/进度条底色.png new file mode 100644 index 0000000..05581b0 Binary files /dev/null and b/Assets/Res/ui/videopage/进度条底色.png differ diff --git a/Assets/Res/ui/videopage/进度条底色.png.meta b/Assets/Res/ui/videopage/进度条底色.png.meta new file mode 100644 index 0000000..8c2f692 --- /dev/null +++ b/Assets/Res/ui/videopage/进度条底色.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 85008df8bc29d934bad661ef65c1943c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs b/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs index e8f2ba0..790a04f 100644 --- a/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs +++ b/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs @@ -170,6 +170,7 @@ namespace Kill.UI.Pages { foreach (var item in data.data.records) { + Debug.Log(totalCount); KillData kd = new KillData() { @@ -178,7 +179,7 @@ namespace Kill.UI.Pages dis=item.distance }; CreateKillItem(kd); - + Debug.Log(totalCount); totalCount++; @@ -226,8 +227,12 @@ namespace Kill.UI.Pages if (videoUIItemPrefab == null || content == null) return; var item = Instantiate(videoUIItemPrefab, content); - item.GetComponent().Init(data.time, data.coverUrl); - item.GetComponent