From 106f31514dfa7a69823d2e121ea9a4673d7747f8 Mon Sep 17 00:00:00 2001 From: Ducnv Date: Mon, 16 Sep 2024 22:43:05 +0700 Subject: [PATCH 1/3] - remove COPPA support --- .DS_Store | Bin 0 -> 8196 bytes VirtueSky/.DS_Store | Bin 8196 -> 14340 bytes .../Advertising/Runtime/General/AdSetting.cs | 2 -- .../Runtime/Max/MaxClient/MaxAdClient.cs | 1 - VirtueSky/Utils/Editor/.DS_Store | Bin 8196 -> 10244 bytes 5 files changed, 3 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a4ff303ba1bc9d1c212aa10394c7eb860b21d392 GIT binary patch literal 8196 zcmeHMO>fgM7=GU}Sju3_V1t1`is%K2X^bzS2_Z_i2_`-^mT7F_qa>|Y!ZN!`(v2}q z>KRV_0JwAFio_q_!VzwWp8!`*@Y+uI(XK+`fRL~yzmH?Tj~zdW?Y=1hV4+q%126yp z7G;Tc7nvQBY?rwuWzrhSL*fJ61{cOBLQ(R=7H?Bw6fg=H1&jhl0i(dbpa7lOGFffT zecfuTQNSqhUn(H?2Zyr6e2R6AYU?1QLIA=Js#b~06bC4dlVU!_x<*B%K6UhfDHYQY z12vu69qCS(PqD61(*ZRdFdZ4w2nE&X#B-E8U|yrKMggNhs{-=u?}VE$0i!U!HGUU9 zwaCSEmGaO}m8b-;Z@V`P!4fb?z|(R62JdYPuL>TNV3BNv7(?&`Vi3T$^YC~RuNT_z z+Kr4antI5>G|lZQjKM8JdB5eRF@H2Mx?36TM$1&1xLKHm03uSPMzeHjzN_0u%Y6Dh z!(WN3eyFs3=U2lZPKJj+V`f*!?meAWr`2UWa36~mH}R5MT=1fM@@hti&~KDIe>Pw% zMZ0fQ@Wcx^ixeR!Gjh3qH{fNlQV=y>juqF{4OZ657VUwxwR6K~2c0t`=hg?EwULnv zgUohAr+^m{et&&gQW`*kRTErMv{Y@?`#4MTHQl2l`J#i@#VK^n?APEGY zzaNw06A4?I;0uCATqdDn!kL@*qR8VFR#<%ydOiy$c|jzJSdyNyx02vf z5tBX51yq)E$zA!b1Z|NrCu z4bdoI6!`ZQz>YC@tU&kKINO_VS;pE9<{9 literal 0 HcmV?d00001 diff --git a/VirtueSky/.DS_Store b/VirtueSky/.DS_Store index 3cc057e57ad043c62abf4ba6bd68f68c256bd923..997dc8888bb4e686323e35552433242e1e2453bf 100644 GIT binary patch literal 14340 zcmeHNYit}>6+UPD$c%Svk4@+!bY%ypX%*7gDFM=!hV>&4w{~p0>%?|L!#<|=G~*ew zGrNu}QMp1C5J*(zA@Qdb&!6TY5Fk`2{6YeXKmmzLR0xnLfBGwbg4C9C?#!lhXZKQ6 zA;e>5HFM|Ap6`5nzjMyqy|W7dIMt{f1(*N;opx?5lMYV+jB=aU_d(o^}0d#q}#>N2P_=sC_zGg$rkmhi>7a4z|n$lk_PE5}z=7vOsn!&+zpWA_p@x3K}~U>FCqQ z%CMH^!F&p3bw;UJ@slaMejQ(eZF-K98W$@sjjKOxuVP~DC1fw0gr;~#6G9-X$0|#< zxumU%L1_M1Li0X2C9NvNL040gh(7=`*tbPi5alsIRLg0l$@v8FX- z&66mrGfK(IF-YPKI72)<#xm_ySch$SltTL?VxS$NViU1QV!KGmGHl8WLi?8!+Ut>( z%B#>lX>X9d2LWdsjX>nP%pkN*A_m$KDmIbjNo)@0h=;S!rOc|4dYu?q=OoJNj8d@* z)sy&cm?x$Hs`AK$!bv-$WvBAYYHJTA)b59~l-nVBf0*_v#fQ)N8EC4qSa%6ItVXKX zITDhOeprACJQ7E4k$CwY>=65!JW`H>gdA2QmFyH1$wwdE?d!zGRab&7I?{7rnU^CW zVFo*4RE!)S3Ec}1#0s~KP(f1;tYrOI?l~Bm&1{0CK12CTb)t=Xg0Zy zFUG6^eJAIq45tL6SS`x)7tiZ0)W!y#GiwKwij`;k7Cx})d=KGE^twoEm<1@N*l0Fy zS$pGjZpzjw7M{~vxSB)fJ%nqB)r~JR@C@Fvq%(lN*DY1v$wGd1(hF1kO^se1SJl#U zmR!FCK(SFy6`Izc!w@d9dH-95c~bfYh4_UF$p zudJFEmYu5a6`e=zi`HPU?r+Ufcd>3a9eeA1)pr{kUU1PGs+Qeq!!3vQr0cRVT^kIl zb>DRt{lEzw-&-D7EicQBiu0j{6K-2$x*l=t&yN|_ zck~N2`jGQ}jXl=HJNfwe>WGa7kxaj*G4-B_;r8yhs3Ai6e{pV6(K>JKsTTsa6A zHf^uc7HyTG-gnc@ z!}(%Qw zC0e5U@Hl)5o`G+}v+zUs1^gCXgg?W}a1H(jufVI=g(eQ;EqDO$z;T?wqj)#ogZJVI zydO)rgy*n=m(WEIeGKu#_!#csrj_@evW0GHWY_P+Io8%J+FG=A*(y_46I zG0NRmx+cp&WWH1{BJ)Ldq_Z}vM{{I}O2fXaDobk*m#}_?t@pp(9I<++c%tsX+o;=1 zg%fq(ad>3J(x_ge?!?g%)9RvXGz9ithpCHk=dQa=)9R+WjNUtur!K^uscCYje>rKgUZy~%K&C*Zz?)K_Cqhl+s69zbYsLTn-<0nR zlqrxY@ZX^TcFz=Nrs%V_)|%;$&HuF;G*1FP>WcU$6iF4p#Z@g&6KJh{BW_Au14o2q90ZOiH6DO!{yfTqd5TqUmB)EZuE6BW!7r!%4<~Px0 dWSDHiqs##`3uG6= sdkKey; - public bool ApplovinEnableAgeRestrictedUser => applovinEnableAgeRestrictedUser; public MaxBannerVariable MaxBannerVariable => maxBannerVariable; public MaxInterVariable MaxInterVariable => maxInterVariable; public MaxRewardVariable MaxRewardVariable => maxRewardVariable; diff --git a/VirtueSky/Advertising/Runtime/Max/MaxClient/MaxAdClient.cs b/VirtueSky/Advertising/Runtime/Max/MaxClient/MaxAdClient.cs index b303fb28..9468c13e 100644 --- a/VirtueSky/Advertising/Runtime/Max/MaxClient/MaxAdClient.cs +++ b/VirtueSky/Advertising/Runtime/Max/MaxClient/MaxAdClient.cs @@ -10,7 +10,6 @@ public override void Initialize() #if VIRTUESKY_ADS && VIRTUESKY_APPLOVIN MaxSdk.SetSdkKey(adSetting.SdkKey); MaxSdk.InitializeSdk(); - MaxSdk.SetIsAgeRestrictedUser(adSetting.ApplovinEnableAgeRestrictedUser); adSetting.MaxBannerVariable.Init(); adSetting.MaxInterVariable.Init(); adSetting.MaxRewardVariable.Init(); diff --git a/VirtueSky/Utils/Editor/.DS_Store b/VirtueSky/Utils/Editor/.DS_Store index 293dacc929239b1bc068b27b486c9d4b36ced2da..6096d3c126275305688ba3a2d97a4a9479221585 100644 GIT binary patch delta 632 zcmZWnJ#W)M7=GWFvre^N?FpO zD?`$ zFDx$I(2Yzsm&s=eh2qWS!b>8j(95nPnsfba=}U399xZ8F|8Ly_18a~G@e1kT=jpGyQg`;(6ic>&ekt;9F z{LzNP&dbK-{N#9LE~CYM Date: Mon, 16 Sep 2024 22:44:26 +0700 Subject: [PATCH 2/3] Update AdSettingEditor.cs --- VirtueSky/Advertising/Editor/AdSettingEditor.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/VirtueSky/Advertising/Editor/AdSettingEditor.cs b/VirtueSky/Advertising/Editor/AdSettingEditor.cs index 274616cd..377a1ded 100644 --- a/VirtueSky/Advertising/Editor/AdSettingEditor.cs +++ b/VirtueSky/Advertising/Editor/AdSettingEditor.cs @@ -15,7 +15,6 @@ public class AdSettingEditor : Editor private SerializedProperty _adLoadingInterval; private SerializedProperty _sdkKey; - private SerializedProperty _applovinEnableAgeRestrictedUser; private SerializedProperty _maxBannerVariable; private SerializedProperty _maxInterVariable; @@ -53,8 +52,6 @@ void Initialize() _adLoadingInterval = serializedObject.FindProperty("adLoadingInterval"); _sdkKey = serializedObject.FindProperty("sdkKey"); - _applovinEnableAgeRestrictedUser = - serializedObject.FindProperty("applovinEnableAgeRestrictedUser"); _maxBannerVariable = serializedObject.FindProperty("maxBannerVariable"); _maxInterVariable = serializedObject.FindProperty("maxInterVariable"); _maxRewardVariable = serializedObject.FindProperty("maxRewardVariable"); @@ -126,7 +123,6 @@ void SetupMax() GuiLine(1); GUILayout.Space(10); EditorGUILayout.PropertyField(_sdkKey); - EditorGUILayout.PropertyField(_applovinEnableAgeRestrictedUser); EditorGUILayout.BeginHorizontal(); EditorGUILayout.PropertyField(_maxBannerVariable); if (_maxBannerVariable.objectReferenceValue == null) From 734f7f49ce0e2c6edcf7febc8bec91db969f29c9 Mon Sep 17 00:00:00 2001 From: Ducnv Date: Mon, 16 Sep 2024 22:45:43 +0700 Subject: [PATCH 3/3] - update version --- README.md | 4 ++-- VirtueSky/ControlPanel/ConstantPackage.cs | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 251a7b61..df9d9141 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ ### 1: Download the repo and drop it into folder `Assets` ### 2: Add the line below to `Packages/manifest.json` -for version `3.0.2` +for version `3.0.3` ```csharp -"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.0.2", +"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.0.3", ``` ## Includes modules diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs index 218f1a38..4be8329b 100644 --- a/VirtueSky/ControlPanel/ConstantPackage.cs +++ b/VirtueSky/ControlPanel/ConstantPackage.cs @@ -2,7 +2,7 @@ { public class ConstantPackage { - public const string VersionSunflower = "3.0.2"; + public const string VersionSunflower = "3.0.3"; public const string PackageNameInAppPurchase = "com.unity.purchasing"; public const string MaxVersionInAppPurchase = "4.12.2"; public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json"; diff --git a/package.json b/package.json index e8c2ffe2..6259ccc3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "com.virtuesky.sunflower", "displayName": "Sunflower", "description": "Core ScriptableObject Architecture for building Unity games", - "version": "3.0.2", + "version": "3.0.3", "unity": "2022.3", "category": "virtuesky", "license": "MIT",