Skip to content

Commit

Permalink
Merge pull request #24 from wolf-org/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
VirtueSky authored Nov 4, 2024
2 parents c2f7213 + b3ff3a1 commit 125bd76
Show file tree
Hide file tree
Showing 10 changed files with 366 additions and 146 deletions.
16 changes: 8 additions & 8 deletions Module/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 VersionUnityCommon = "1.4.2";
public const string VersionUnityCommon = "1.4.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 Expand Up @@ -50,35 +50,35 @@ public class ConstantPackage
public const string PackageNameFirebaseApp = "com.google.firebase.app";

public const string MaxVersionFirebaseApp =
"https://github.com/firebase-unity/firebase-app.git#12.3.0";
"https://github.com/firebase-unity/firebase-app.git#12.4.0";

public const string PackageNameFirebaseRemoteConfig = "com.google.firebase.remote-config";

public const string MaxVersionFirebaseRemoteConfig =
"https://github.com/firebase-unity/firebase-remote-config.git#12.3.0";
"https://github.com/firebase-unity/firebase-remote-config.git#12.4.0";

public const string PackageNameFirebaseAnalytics = "com.google.firebase.analytics";

public const string MaxVersionFirebaseAnalytics =
"https://github.com/firebase-unity/firebase-analytics.git#12.3.0";
"https://github.com/firebase-unity/firebase-analytics.git#12.4.0";

public const string PackageNameFirebaseDatabase = "com.google.firebase.database";

public const string MaxVersionFirebaseDatabase =
"https://github.com/firebase-unity/firebase-database.git#12.3.0";
"https://github.com/firebase-unity/firebase-database.git#12.4.0";

public const string PackageNameFirebaseAuth = "com.google.firebase.auth";
public const string MaxVersionFirebaseAuth = "https://github.com/firebase-unity/firebase-auth.git#12.3.0";
public const string MaxVersionFirebaseAuth = "https://github.com/firebase-unity/firebase-auth.git#12.4.0";

public const string PackageNameFirebaseCrashlytics = "com.google.firebase.crashlytics";

public const string MaxVersionFirebaseCrashlytics =
"https://github.com/firebase-unity/firebase-crashlytics.git#12.3.0";
"https://github.com/firebase-unity/firebase-crashlytics.git#12.4.0";

public const string PackageNameFirebaseSupportIos = "com.google.firebase.support-ios";

public const string MaxVersionFirebaseSupportIos =
"https://github.com/firebase-unity/firebase-support-ios.git#12.3.0";
"https://github.com/firebase-unity/firebase-support-ios.git#12.4.0";

#endregion

Expand Down
336 changes: 208 additions & 128 deletions Module/Hierarchy/Editor/Scripts/Data/HierarchyResources.cs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Module/Misc/Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ public static void CheckInternetConnection(Action actionConnected, Action action
public static IEnumerator InternetConnection(Action<bool> action)
{
bool result;
string url = "http://google.com";
string url = "https://google.com";
#if UNITY_ANDROID
url = "http://google.com";
url = "https://google.com";
#elif UNITY_IOS
url = "https://captive.apple.com/hotspot-detect.html";
#endif
Expand Down
8 changes: 4 additions & 4 deletions Module/Tracking/AppTracking.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ public static void StartTrackingAdjust()
{
#if VIRTUESKY_ADJUST
var adjust = new UnityEngine.GameObject("Adjust", typeof(AdjustSdk.Adjust));
var adjustConfig = new AdjustSdk.AdjustConfig(AdjustConfig.AppToken, AdjustConfig.AdjustEnvironment, AdjustConfig.LogLevel == AdjustSdk.AdjustLogLevel.Suppress);
adjustConfig.LogLevel = AdjustConfig.LogLevel;
adjustConfig.IsAdServicesEnabled = true;
adjustConfig.IsIdfaReadingEnabled = true;
var adjustConfig = new AdjustSdk.AdjustConfig(AdjustConfig.AppToken, AdjustConfig.AdjustEnvironment, AdjustConfig.LogLevel == AdjustSdk.AdjustLogLevel.Suppress)
{
LogLevel = AdjustConfig.LogLevel, IsAdServicesEnabled = true, IsIdfaReadingEnabled = true
};
AdjustSdk.Adjust.InitSdk(adjustConfig);
UnityEngine.Debug.Log($"Start Tracking {adjust.name}");
#endif
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions Module/Utils/Editor/Icons/scriptable_particle_system.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Module/Utils/Editor/UnityPackage/Note_Package.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- Version Max Sdk: 8.0.0
- Version Admob Sdk: v9.2.0
- Version IronSource Sdk: v8.1.0
- Version IronSource Sdk: v8.4.0
- Version Google Game Play Service: v11.01
Binary file modified Module/Utils/Editor/UnityPackage/is-sdk.unitypackage
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 `1.4.2`
for version `1.4.3`
```csharp
"com.wolf-org.sunflower2":"https://github.com/wolf-org/sunflower_2.git#1.4.2",
"com.wolf-org.sunflower2":"https://github.com/wolf-org/sunflower_2.git#1.4.3",
```

## Includes modules
Expand Down
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.wolf-org.sunflower2",
"displayName": "Sunflower2",
"description": "Core singleton for building Unity games ",
"version": "1.4.2",
"version": "1.4.3",
"unity": "2022.3",
"category": "virtuesky",
"license": "MIT",
Expand Down

0 comments on commit 125bd76

Please sign in to comment.