Skip to content

Commit

Permalink
Merge pull request #18 from VirtueSky/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
VirtueSky authored Sep 16, 2024
2 parents b06f5b8 + 734f7f4 commit 1a7f479
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 11 deletions.
Binary file added .DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified VirtueSky/.DS_Store
Binary file not shown.
4 changes: 0 additions & 4 deletions VirtueSky/Advertising/Editor/AdSettingEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class AdSettingEditor : Editor
private SerializedProperty _adLoadingInterval;

private SerializedProperty _sdkKey;
private SerializedProperty _applovinEnableAgeRestrictedUser;

private SerializedProperty _maxBannerVariable;
private SerializedProperty _maxInterVariable;
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions VirtueSky/Advertising/Runtime/General/AdSetting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,13 @@ public AdNetwork CurrentAdNetwork
#region AppLovin

[TextArea, SerializeField] private string sdkKey;
[SerializeField] private bool applovinEnableAgeRestrictedUser;
[SerializeField] private MaxBannerVariable maxBannerVariable;
[SerializeField] private MaxInterVariable maxInterVariable;
[SerializeField] private MaxRewardVariable maxRewardVariable;
[SerializeField] private MaxRewardInterVariable maxRewardInterVariable;
[SerializeField] private MaxAppOpenVariable maxAppOpenVariable;

public string SdkKey => sdkKey;
public bool ApplovinEnableAgeRestrictedUser => applovinEnableAgeRestrictedUser;
public MaxBannerVariable MaxBannerVariable => maxBannerVariable;
public MaxInterVariable MaxInterVariable => maxInterVariable;
public MaxRewardVariable MaxRewardVariable => maxRewardVariable;
Expand Down
1 change: 0 additions & 1 deletion VirtueSky/Advertising/Runtime/Max/MaxClient/MaxAdClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion VirtueSky/ControlPanel/ConstantPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Binary file modified VirtueSky/Utils/Editor/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 1a7f479

Please sign in to comment.