Skip to content

Commit 36c6c18

Browse files
authored
Merge pull request #47 from VirtueSky/dev
Dev
2 parents d0eae57 + 996f862 commit 36c6c18

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
### 1: Download the repository and drop it into folder `Assets`
2424
### 2: Add the line below to `Packages/manifest.json`
2525

26-
for version `3.2.6`
26+
for version `3.2.7`
2727
```csharp
28-
"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.2.6",
28+
"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.2.7",
2929
```
3030

3131
## Includes modules

VirtueSky/Advertising/Runtime/Admob/AdmodUnitVariable/AdmobNativeOverlayVariable.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void Hide()
127127
/// </summary>
128128
public void RenderAd()
129129
{
130-
#if VIRTUESKY_ADS && VIRTUESKY_ADS
130+
#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
131131
if (_nativeOverlayAd == null) return;
132132
_nativeOverlayAd.RenderTemplate(Style(), ConvertSize(), ConvertPosition(adsPosition));
133133
#endif
@@ -139,7 +139,7 @@ public void RenderAd()
139139
/// <param name="uiElement">RectTransform of uiElement, used to determine position for native overlay ads</param>
140140
public void RenderAd(RectTransform uiElement)
141141
{
142-
#if VIRTUESKY_ADS && VIRTUESKY_ADS
142+
#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
143143
if (_nativeOverlayAd == null) return;
144144
(int admobX, int admobY) = ConvertUiElementPosToNativeAdsPos(uiElement);
145145
_nativeOverlayAd.RenderTemplate(Style(), admobX, admobY);
@@ -154,7 +154,7 @@ public void RenderAd(RectTransform uiElement)
154154
/// <param name="height">Custom height for native overlay ads</param>
155155
public void RenderAd(RectTransform uiElement, int width, int height)
156156
{
157-
#if VIRTUESKY_ADS && VIRTUESKY_ADS
157+
#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
158158
if (_nativeOverlayAd == null) return;
159159
(int admobX, int admobY) = ConvertUiElementPosToNativeAdsPos(uiElement);
160160
_nativeOverlayAd.RenderTemplate(Style(), new AdSize(width, height), admobX, admobY);
@@ -174,7 +174,8 @@ public void RenderAd(RectTransform uiElement, Camera camera, bool useSizeUiEleme
174174
(int admobX, int admobY) = ConvertUiElementPosToNativeAdsPos(uiElement, camera);
175175
if (useSizeUiElement)
176176
{
177-
_nativeOverlayAd?.RenderTemplate(Style(), new AdSize((int)uiElement.rect.width, (int)uiElement.rect.height), admobX, admobY);
177+
_nativeOverlayAd?.RenderTemplate(Style(),
178+
new AdSize((int)uiElement.rect.width, (int)uiElement.rect.height), admobX, admobY);
178179
}
179180
else
180181
{

VirtueSky/ControlPanel/ConstantPackage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class ConstantPackage
44
{
5-
public const string VersionSunflower = "3.2.6";
5+
public const string VersionSunflower = "3.2.7";
66
public const string PackageNameInAppPurchase = "com.unity.purchasing";
77
public const string MaxVersionInAppPurchase = "4.12.2";
88
public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";
@@ -98,12 +98,12 @@ public class ConstantPackage
9898
public const string PackageNameCoffeeUIEffect = "com.coffee.ui-effect";
9999

100100
public const string MaxVersionCoffeeUIEffect =
101-
"https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.1.0";
101+
"https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.2.2";
102102

103103
public const string PackageNameCoffeeUIParticle = "com.coffee.ui-particle";
104104

105105
public const string MaxVersionCoffeeUIParticle =
106-
"https://github.com/mob-sakai/ParticleEffectForUGUI.git#4.10.6";
106+
"https://github.com/mob-sakai/ParticleEffectForUGUI.git#4.10.7";
107107

108108
public const string PackageNameAppleSignIn = "com.lupidan.apple-signin-unity";
109109

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "com.virtuesky.sunflower",
33
"displayName": "Sunflower",
44
"description": "Core ScriptableObject Architecture for building Unity games",
5-
"version": "3.2.6",
5+
"version": "3.2.7",
66
"unity": "2022.3",
77
"category": "virtuesky",
88
"license": "MIT",

0 commit comments

Comments
 (0)