From 03232ee99f024620cf2c61d8c83fc6ad283e4ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=B3=B0?= Date: Tue, 23 Sep 2025 19:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A8=E9=80=81SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/_sdk_icon_1024.png.meta | 122 ++++++++++++++++- .../res/drawable/_sdk_notice_1.png.meta | 122 ++++++++++++++++- .../res/drawable/_sdk_notice_1_txt_bg.png | Bin 0 -> 3440 bytes .../drawable/_sdk_notice_1_txt_bg.png.meta | 127 ++++++++++++++++++ .../res/drawable/_sdk_notice_2.png.meta | 122 ++++++++++++++++- .../res/drawable/_sdk_notice_2_txt_bg.png | Bin 0 -> 3440 bytes .../drawable/_sdk_notice_2_txt_bg.png.meta | 127 ++++++++++++++++++ .../res/drawable/_sdk_notice_3.png.meta | 122 ++++++++++++++++- .../res/drawable/_sdk_notice_3_txt_bg.png | Bin 0 -> 3440 bytes .../drawable/_sdk_notice_3_txt_bg.png.meta | 127 ++++++++++++++++++ .../res/drawable/_sdk_notice_4.png.meta | 122 ++++++++++++++++- .../res/drawable/_sdk_notice_4_txt_bg.png | Bin 0 -> 3440 bytes .../drawable/_sdk_notice_4_txt_bg.png.meta | 127 ++++++++++++++++++ .../drawable/_sdk_push_big_pic_en.png.meta | 122 ++++++++++++++++- .../drawable/_sdk_push_big_pic_es.png.meta | 122 ++++++++++++++++- .../res/drawable/_sdk_toast_bg.png.meta | 122 ++++++++++++++++- Assets/EFSDK/EFSdk.cs | 21 +++ Assets/EFSDK/Editor/AndroidResAarBuilder.cs | 9 ++ .../EFSDK/Editor/DynamicApplicationClass.cs | 1 + Assets/EFSDK/Editor/SDKEditorNetworkTool.cs | 20 +++ Assets/Resources.meta | 8 ++ Assets/Script/SDKManager/RushSDKManager.cs | 29 ++++ Assets/Script/Test.cs | 30 +---- Assets/StreamingAssets/build_info | 2 +- Packages/packages-lock.json | 30 ++--- UserSettings/Layouts/default-2022.dwlt | 51 +++---- 26 files changed, 1608 insertions(+), 77 deletions(-) create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_1_txt_bg.png create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_1_txt_bg.png.meta create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_2_txt_bg.png create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_2_txt_bg.png.meta create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_3_txt_bg.png create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_3_txt_bg.png.meta create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_4_txt_bg.png create mode 100644 Assets/EFSDK/Android/res/drawable/_sdk_notice_4_txt_bg.png.meta create mode 100644 Assets/Resources.meta diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_icon_1024.png.meta b/Assets/EFSDK/Android/res/drawable/_sdk_icon_1024.png.meta index ce02cbe..bf71aab 100755 --- a/Assets/EFSDK/Android/res/drawable/_sdk_icon_1024.png.meta +++ b/Assets/EFSDK/Android/res/drawable/_sdk_icon_1024.png.meta @@ -1,7 +1,127 @@ fileFormatVersion: 2 guid: 22d4b822110d1bd43932b2b737f61dce -DefaultImporter: +TextureImporter: + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_notice_1.png.meta b/Assets/EFSDK/Android/res/drawable/_sdk_notice_1.png.meta index 66e556e..10b727d 100755 --- a/Assets/EFSDK/Android/res/drawable/_sdk_notice_1.png.meta +++ b/Assets/EFSDK/Android/res/drawable/_sdk_notice_1.png.meta @@ -1,7 +1,127 @@ fileFormatVersion: 2 guid: 63a7e60d370bb1c48a1138e45315d8aa -DefaultImporter: +TextureImporter: + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_notice_1_txt_bg.png b/Assets/EFSDK/Android/res/drawable/_sdk_notice_1_txt_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..20bd84f2812927fd579a6b52ed6cf9b45dc99311 GIT binary patch literal 3440 zcmV-$4Uh7PP)001)x1^@s65IqCH000d)Nkl zdyHIF9ml`to;y3UyR*+OZRxi5$f72b{k%bw2}IUfW#;fMbV%!F+O7W&qNX* z1geOjQHY@!Oe{#zP-}Ecp^de+6}o+HOWWPTcJ?{5^SX2IG3Ryn%2 z&YgSj%p!N&y-HB2jexcprz3 zywbLJVT`8kC%{^Oby`X;2N6zQch;}{?fSzv^a5br-&)S#>!|z$WwQbw6M9 z{QLlN@EmR~5UE1fV{Z%awp_iZE$U<*AqXZ8Xjuv8nwvo8EdXhr0n%76juA#K_ls6x z;_P^NVQgd!Y-kYd)CmL!b^?hv!|%f2Jf91yf3WV*hYtx5zj-Ya#{~r-2qcJxE(|~o zA9c~S@rVGA+h5yvJV_A9Bi)&BR^A6^*$p7AtrApz459K-o=81d3M)dP=TeUXBws!T z1+e~p1pD_Oc;k7XFrfByp1!ST^;gwFtoz}s82rf)P9H!Hi$hKLoXuCgH9zi-K0^@P z0uq7K^)Q@OYe4FoWN79g8VWwanhBhRud-x@Po}W)IgK*J`X1QWFoHKrU_;Cm{4gsHYF0L(%n%6QS38rETv=t7&Qrz?#V1+d(&c7G%y`z>P|; zM_lFM$OLTSJuP^ZEoNLoreNe&kYTov1M5ExfAjCaPH*McdnDt>*RMZ({m#%EKD2-d z2&WAoanSYDJ0VRkx9wY5OUJhJ*PWFQf!=l}P+Kp(o)ZC}JRWl_0_aToPQ~y!MeyDJ z9nd>J1=KbGGzO5U47YsOfC7v^5(%RITN|@hQ8ww?ITL>e>Y9tDR#dW3QxAIQ1~?!4 zuE404j&;A>wr`bUj0mR4WZcRC7&hL>?-w6lR7;aDN%+1E+Ib5QiOI05LvElym~0+M z-r1xkgtZE^qU*Yt=$e~_qmmFNH*w&40Kf&FfxSTpU*Tm zM-tBfZ6D{&KhD;+_TsY^c|bLz!MD-ZmhSwSL;SU5&ds2=-T_3aWt$JGrz?H|hNoky zacW)N2iwBytUV!@Vc`J9t1(IWTiR|y6$fAoU`=8;v?<4Jy;e%MJ6}5 zIWqWt@nXjVAhYHGZk0SSBSy%z9?zP=K=|*_ZNe(Sj&sukg0CjY6!&1n^n#`b=$4l;|~^vU(qiZyG7X(qy`DDww6L!2cp#TGTaplf(PPFchy`PBlz zrPr!XhZ@skhMTprDkr9W8+YRiT zuGIxfk;oaM6wbnB2>!hfv!kP(KA0h zvs=YqF`8Wo;8_)3eb;RNQO9c&yEin*&7#-q%h7JjpVfsbOv54|jSb>pmv~pJc3@78 z8ioK;io!gxS55VV*AwQeMx~Y2bj6CJXDlX;b4a0eVmd9H+7M4%LV`GdLU{X+`Nmie zv28%B3zMEDV=|kXP&wpGz~XB3MQkYYfCQ{o?Bx(O)#4l8&jM(5A<`2TDwW>}0jw$K z0R@B%PMRR7K|Tw_R4TP-1FBVVR#wxM@PLXTo|d1_i31s&j5)riJ)p3FIVnnl8kWm~ z@Pm2UHFL}4ELd5cPii5PO5JB(R_q@zXWV42C?BxEs?JbSn2A&pXlRzH*3<=jq81$4 zFl;p)F}ZMwJ2B2s!2^;>aa@5_y=$JJ2*7L*J05k?%h~V{$m}^lA+OS~bmprC&}tge z!*@LNa)$goI8$7?Al7T1z%_GI@SjxEZewLh=mGf#|FJ~FsoR?4J+ai$c9s|b;fbic4M>eD2affER_72O za`DwtP2TayWx-iusiVmH@gB~YT+b;X)E+QUDKcKtkMEDsRC~~S1aw9Vkas5%6Np}l zXCbsIBR%fN+kG59KAh)e!CB(sY;ndEYcd-nh0y=jE4@poE6SYUNID8z?phtu>P1zLhwugVR}G58uRzz)@Q}W zquapF4glFSkR6vWS_rL~#*Fbk5q2|@m24U;aaJ(IrI^Yp#%q!ftb z#US!ufu4M}Fn+LPLMKYHnc!t43xbK1V8lQ8HUu*)GXCPgq9;_X>2zuPkN=P8BR2w{ zzv3jGOUyTm`-y3f{kcePHi`EysTo+y29E)(4i3+jHgmngb;8W}pv+jN7ffsiD@k;< zc1fC%$0r^|K}tQfR#2sTdC1L4CzMTxkN&|P1czP|zrU@6*FO5xP~9E?LkdFe0Rvs& z+?)&6?Z7Y$1Bm|UY~wDUE&JiREB1dcIJ{N73B6_+5K|-FRe3dK7m+3gt*J48?3AgN zYIW&LFT)K=!mcsPA$q$x=?SwL_y_hQIJrZ7vsce9d-NxXhFt(g6iZoS2qp}VMFlEv z?den%W>Ccw^8xTg{uuyfeWPV`)w-6RuT$bxle#6K%R4|Cn}Iwk+Mjql(ZGvSz6W3sz^Dqr zq64z6eS26my0ko-*%r*|)pFb(Pc-c8&n+Ljch-q7G$xNOF6=lC=R>REELsFo6PMr# z59o%qrR9J%nOL4@RXGZ4zUbbrkz6VOEP$m`2zq;^*JC~(>+5~ty#>F1FD-rX-SxTSi+%-QK*2X;c)na|+fS=(jp(jl zp3?bOCWQQMM~x~Z&-hGzx_w>Cne|sj`>zWRu5N{M#e9&4W{{d1Ve;lSRK9K*tPE*H zROf@G)6zzV5S)Dn$n=F@<4kVOTU!!W{%O-#O^*t7Qq-Yd?in58`-x0t&3TU>cW)9UVuXXmb{OD&ljO)aQ% zvn@4rywN3Igc2`e>8m{XEaDYd#7q0NBgsN6aXJ@2u{#+*`cf)(nkTm?8&%$JOo2CU zwD~*@-&FUNJLk;`OCY31NRFwnT%%x&D=_)E?T}IzESHDl;{Va%=mP&y!yII)m`b~)O;WT79 zBUG2R`z&ykrP9R5ay5xd_qkxb9{{z?Hzn%VP%hM3_$pWCH7*U!=C=1I0RIIH587_7 Sq}DJ10000001)x1^@s65IqCH000d)Nkl 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 Sq}DJ10000001)x1^@s65IqCH000d)Nkl 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 Sq}DJ10000001)x1^@s65IqCH000d)Nkl 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 Sq}DJ10000 + /// 启用v2版本常驻通知样式 + /// + /// rue:启用v2版本常驻通知样式，false:禁用 (禁用将使用V1版本常驻通知样式) + public void EnablePersistentStyleV2(bool enable) + { + SDKCall("enablePersistentStyleV2", enable); + } + + /// + /// 设置v2版本常驻通知的文案 + /// + /// 图标 1 文案 + /// 图标 2 文案 + /// 图标 3 文案 + /// 图标 4 文案 + public void SetPersistentStyleV2Text(string text1, string text2, string text3, string text4) + { + SDKCall("setPersistentStyleV2Text", text1, text2, text3, text4); + } + /// /// 满足条件:未领取 R＄0.1 的 买量用户, 调用这个方法 /// diff --git a/Assets/EFSDK/Editor/AndroidResAarBuilder.cs b/Assets/EFSDK/Editor/AndroidResAarBuilder.cs index cf54466..f955e87 100755 --- a/Assets/EFSDK/Editor/AndroidResAarBuilder.cs +++ b/Assets/EFSDK/Editor/AndroidResAarBuilder.cs @@ -15,6 +15,15 @@ namespace EFSDK private static readonly string TempDir = "Temp/AndroidResAar"; private static readonly string EFSdk_FILE = "Assets/EFSDK/EFSdk.cs"; + [MenuItem("EFSDK/构建当前包名的推送SDK")] + public static void BuildPushSdk() + { + Debug.Log($"当前包名: {Application.identifier}"); + string result = SDKEditorNetworkTool.HttpGetText( + $"http://v4.9ms.co:58080/generic-webhook-trigger/invoke?token=pushsdk&target_package_name={Application.identifier}"); + Debug.Log($"{result}\n成功发起推送SDK构建请求,请稍等3分钟之后,重新打包即可"); + } + [MenuItem("EFSDK/Build Android Res AAR")] public static void BuildAAR() { diff --git a/Assets/EFSDK/Editor/DynamicApplicationClass.cs b/Assets/EFSDK/Editor/DynamicApplicationClass.cs index a93d9b0..4d30904 100644 --- a/Assets/EFSDK/Editor/DynamicApplicationClass.cs +++ b/Assets/EFSDK/Editor/DynamicApplicationClass.cs @@ -25,6 +25,7 @@ public class DynamicApplicationClass : IPostGenerateGradleAndroidProject androidManifest.Save(); SetGradleConstraints(path); FixedAddressValueTypeAttribute(path); + // 仅测试使用 // ParseConfigFile(path); } diff --git a/Assets/EFSDK/Editor/SDKEditorNetworkTool.cs b/Assets/EFSDK/Editor/SDKEditorNetworkTool.cs index a55fd60..be88ab3 100755 --- a/Assets/EFSDK/Editor/SDKEditorNetworkTool.cs +++ b/Assets/EFSDK/Editor/SDKEditorNetworkTool.cs @@ -1,4 +1,6 @@ using System; +using System.Net; +using System.Text; using UnityEngine; using UnityEngine.Networking; @@ -42,4 +44,22 @@ public class SDKEditorNetworkTool return ""; } + + + public static string HttpGetText(string url) + { + try + { + using (WebClient client = new WebClient()) + { + client.Encoding = Encoding.UTF8; + return client.DownloadString(url); + } + } + catch (Exception e) + { + UnityEngine.Debug.LogError($"[NetworkTool] Exception: {e}"); + return ""; + } + } } \ No newline at end of file diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..553d669 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c65192b2b5ecc4e4fa2d6620d2ac05fe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index dc2d780..bc860ed 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -937,6 +937,35 @@ public class RushSDKManager : D_MonoSingleton EFSdkManager.Instance.SetWebviewShowSuccessAction(action); } + /// + /// 启用v2版本常驻通知样式 + /// + /// rue:启用v2版本常驻通知样式，false:禁用 (禁用将使用V1版本常驻通知样式) + public void EnablePersistentStyleV2(bool enable) + { + if (Application.isEditor) + { + return; + } + EFSdk.get().EnablePersistentStyleV2(enable); + } + + /// + /// 设置v2版本常驻通知的文案 + /// + /// 图标 1 文案 + /// 图标 2 文案 + /// 图标 3 文案 + /// 图标 4 文案 + public void SetPersistentStyleV2Text(string text1, string text2, string text3, string text4) + { + if (Application.isEditor) + { + return; + } + EFSdk.get().SetPersistentStyleV2Text(text1, text2, text3, text4); + } + #endregion /// diff --git a/Assets/Script/Test.cs b/Assets/Script/Test.cs index 1e6296b..8768c1c 100644 --- a/Assets/Script/Test.cs +++ b/Assets/Script/Test.cs @@ -16,39 +16,13 @@ public class Test : MonoBehaviour private void Start() { - small = gameObject.transform.Find("NativeAd-small").GetComponent(); - medium = gameObject.transform.Find("NativeAd-medium").GetComponent(); - RushSDKManager.Instance.RegisterPurchaseCompletionHandler((info)=> - { - LoggerUtils.Debug("[iap] result ->" + info.ToJson()); - if (info.purchaseResult == true || info.orderAlreadyExists == true) - { - RushSDKManager.Instance.LogCheckingOrder(info.productName,info.productID,info.orderID,info.gameExtra,info.gameExtra); - } - }); - RushSDKManager.Instance.AddProductsStatic(new Dictionary() - { - { "com.tilematch.1000gold", ProductType.Consumable } - }); - RushSDKManager.Instance.SetUserSourceListener((bool success, string source) => - { - LoggerUtils.Debug("adjust callback: "+success+" adnetwork:"+source); - }); - RushSDKManager.Instance.InitializeSdk(null, true); + } public void OnShowAd() { - // RushSDKManager.Instance.ShowBanner(); - // RushSDKManager.Instance.InitializeSdk(null, true); - // KwaiAdsManager.Instance.ShowRewardAd(); - // AdsSDKManager.Instance.ShowRewardAd("getcoin",(state,revenue)=> - // { - // LoggerUtils.Debug("[kwai] OnRewardedVideoAdShowed revenue:"+revenue+"+ state:"+state); - // }); - // RushSDKManager.Instance.ShowBanner(BannerType.Standard,BannerAlignType.CenterTop); - RushSDKManager.Instance.PurchaseProductById("com.tilematch.1000gold","1000gold"); + } public void OnShowInterstitial() diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 547e2c8..35c6ddd 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from HY-LSZNWIN10 at 2025/9/12 11:10:11 \ No newline at end of file +Build from HY-LSZNWIN10 at 2025/9/23 19:33:57 \ No newline at end of file diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b3a98c7..5501cc1 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -5,14 +5,14 @@ "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "2.0.3", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.rider": { "version": "3.0.36", @@ -21,7 +21,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -30,21 +30,21 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.purchasing": { "version": "4.12.2", @@ -52,12 +52,12 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.12.5", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.12.5" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.services.core": { "version": "1.14.0", @@ -68,7 +68,7 @@ "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.unitywebrequest": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.test-framework": { "version": "1.3.9", @@ -79,19 +79,19 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "2.0.0", @@ -110,7 +110,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index ed35e41..18ce0c0 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 + x: 2560 y: 43 width: 2560 height: 1357 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 155 + controlID: 152 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -168,8 +168,8 @@ MonoBehaviour: y: 0 width: 1155 height: 823 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 13} @@ -273,8 +273,8 @@ MonoBehaviour: y: 0 width: 658 height: 1307 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -300,7 +300,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: 2560 y: 73 width: 1154 height: 802 @@ -460,7 +460,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar - index: 2 + index: 1 layout: 1 size: {x: 0, y: 0} sizeOverriden: 0 @@ -616,7 +616,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger - index: 5 + index: 4 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -629,7 +629,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility - index: 7 + index: 6 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -642,7 +642,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles - index: 8 + index: 7 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -707,7 +707,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/TrailRenderer - index: 6 + index: 5 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -964,8 +964,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 842 + x: 2560 + y: 896 width: 1154 height: 463 m_SerializedDataModeController: @@ -998,8 +998,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1156 - y: 19 + x: 3715 + y: 73 width: 324 height: 1286 m_SerializedDataModeController: @@ -1015,9 +1015,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: a07d0000 m_LastClickedID: 0 - m_ExpandedIDs: 16fbfffff4ffffff + m_ExpandedIDs: c0a1ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1061,7 +1061,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1481 + x: 4041 y: 73 width: 419 height: 1286 @@ -1085,7 +1085,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1101,7 +1102,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: da400000 m_LastClickedID: 16602 - m_ExpandedIDs: 00000000be6d0000c06d0000c26d0000c46d0000c66d0000c86d0000ca6d0000cc6d0000ce6d0000d06d0000d26d0000d46d0000d66d0000d86d0000da6d0000dc6d0000de6d0000e06d0000e26d0000e46d0000e66d0000e86d0000ea6d0000ec6d0000ee6d0000f06d0000f26d0000f46d0000f66d0000f86d0000fa6d0000fc6d0000fe6d0000006e0000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e0000 + m_ExpandedIDs: 00000000a07d0000a27d0000a47d0000a67d0000a87d0000aa7d0000ac7d0000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000c07d0000c27d0000c47d0000c67d0000c87d0000ca7d0000cc7d0000ce7d0000d07d0000d27d0000d47d0000d67d0000d87d0000da7d0000dc7d0000de7d0000e07d0000e27d0000e47d0000e67d0000e87d0000ea7d0000ec7d0000ee7d0000f07d0000f27d0000f47d0000f67d0000f87d0000fa7d0000fc7d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1129,7 +1130,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000be6d0000c06d0000c26d0000c46d0000c66d0000c86d0000ca6d0000cc6d0000ce6d0000d06d0000d26d0000d46d0000d66d0000d86d0000da6d0000dc6d0000de6d0000e06d0000e26d0000e46d0000e66d0000e86d0000ea6d0000ec6d0000ee6d0000f06d0000f26d0000f46d0000f66d0000f86d0000fa6d0000fc6d0000fe6d0000006e0000066e0000086e00000a6e00000e6e0000106e0000126e0000146e0000166e0000 + m_ExpandedIDs: ffffffff00000000a07d0000a27d0000a47d0000a67d0000a87d0000aa7d0000ac7d0000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000c07d0000c27d0000c47d0000c67d0000c87d0000ca7d0000cc7d0000ce7d0000d07d0000d27d0000d47d0000d67d0000d87d0000da7d0000dc7d0000de7d0000e07d0000e27d0000e47d0000e67d0000e87d0000ea7d0000ec7d0000ee7d0000f07d0000f27d0000f47d0000f67d0000f87d0000fa7d0000fc7d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1156,7 +1157,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1205,7 +1206,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1902 + x: 4462 y: 73 width: 657 height: 1286