com.azerion.bluestack 3.1.0-preview2 → 3.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Editor/BlueStackDependencies.xml +2 -2
- package/Editor/BlueStackMediationDependencies.xml +0 -3
- package/Editor/BlueStackSettings.cs +5 -4
- package/Editor/BlueStackSettingsEditor.cs +15 -13
- package/Editor/DependencyProvider.cs +24 -28
- package/Editor/MediationNetworkDependency.cs +0 -9
- package/Editor/iOS/IOSDependencyModifier.cs +2 -2
- package/Editor/iOS/IOSDependencyParser.cs +3 -3
- package/Example/Scripts/NativeAdManager.cs +4 -0
- package/Example/Scripts/SmallNativeAdManager.cs +4 -0
- package/Resources/AdPrefabs/Banners/Banner.prefab +8 -6
- package/Resources/AdPrefabs/Banners/DynamicBanner.prefab +11 -9
- package/Resources/AdPrefabs/Banners/FullBanner.prefab +10 -8
- package/Resources/AdPrefabs/Banners/LargeBanner.prefab +10 -8
- package/Resources/AdPrefabs/Banners/Leaderboard.prefab +8 -6
- package/Resources/AdPrefabs/Banners/MediumRectangle.prefab +8 -6
- package/package.json +1 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<dependencies>
|
|
2
2
|
<androidPackages>
|
|
3
|
-
<androidPackage spec="com.azerion:bluestack-sdk-core:4.3.
|
|
3
|
+
<androidPackage spec="com.azerion:bluestack-sdk-core:4.3.2"/>
|
|
4
4
|
</androidPackages>
|
|
5
5
|
<iosPods>
|
|
6
|
-
<iosPod name="BlueStack-SDK" version="4.4.
|
|
6
|
+
<iosPod name="BlueStack-SDK" version="4.4.4" bitcodeEnabled="false" addToAllTargets="false" subspecs="[]"/>
|
|
7
7
|
</iosPods>
|
|
8
8
|
</dependencies>
|
|
@@ -4,8 +4,5 @@
|
|
|
4
4
|
<iosNetworks>
|
|
5
5
|
<network name="AdMob" package="Google-Mobile-Ads-SDK" active="true"/>
|
|
6
6
|
<network name="Smart Display" package="Smart-Display-SDK" active="true"/>
|
|
7
|
-
<network name="Ogury" package="OguryAds" active="true"/>
|
|
8
|
-
<network name="In-App Bidding" package="In-App-Bidding" active="true"/>
|
|
9
|
-
<network name="ImproveDigital" package="ImproveDigital" active="true"/>
|
|
10
7
|
</iosNetworks>
|
|
11
8
|
</networkList>
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
using System.Collections.Generic;
|
|
2
2
|
using UnityEngine;
|
|
3
|
+
using UnityEngine.Serialization;
|
|
3
4
|
|
|
4
5
|
namespace Azerion.BlueStack.Editor
|
|
5
6
|
{
|
|
@@ -22,11 +23,11 @@ namespace Azerion.BlueStack.Editor
|
|
|
22
23
|
set => Instance.admobAppIdIOS = value;
|
|
23
24
|
}
|
|
24
25
|
|
|
25
|
-
[SerializeField] private List<MediationNetworkDependency>
|
|
26
|
-
public List<MediationNetworkDependency>
|
|
26
|
+
[SerializeField] private List<MediationNetworkDependency> iOSMediationNetworks;
|
|
27
|
+
public List<MediationNetworkDependency> IOSMediationNetworks
|
|
27
28
|
{
|
|
28
|
-
get => Instance.
|
|
29
|
-
set => Instance.
|
|
29
|
+
get => Instance.iOSMediationNetworks;
|
|
30
|
+
set => Instance.iOSMediationNetworks = value;
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
public static BlueStackSettings Instance
|
|
@@ -50,22 +50,24 @@ namespace Azerion.BlueStack.Editor
|
|
|
50
50
|
|
|
51
51
|
void OnEnable()
|
|
52
52
|
{
|
|
53
|
-
|
|
53
|
+
BlueStackSettings.Instance.IOSMediationNetworks.Clear();
|
|
54
54
|
|
|
55
55
|
// Sync/Copy base mediation dependency xml file from Package to Assets directory
|
|
56
|
-
DependencyProvider.
|
|
56
|
+
DependencyProvider.SyncMediationDependencies();
|
|
57
57
|
|
|
58
58
|
iOSAdmobAppIdProperty = serializedObject.FindProperty("admobAppIdIOS");
|
|
59
59
|
androidAdmobAppIdProperty = serializedObject.FindProperty("admobAppIdAndroid");
|
|
60
60
|
|
|
61
|
-
var
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
61
|
+
var iOSMediationNetworkDependencies = DependencyProvider.GetAllMediationNetworkDependencies(new IOSDependencyParser());
|
|
62
|
+
|
|
63
|
+
// BlueStackSettings.Instance.IOSMediationNetworks = BlueStackSettings.Instance.IOSMediationNetworks
|
|
64
|
+
// .Where(x => iOSMediationNetworkDependencies.All(l2 => l2.Name != x.Name)).ToList();
|
|
65
|
+
|
|
66
|
+
BlueStackSettings.Instance.IOSMediationNetworks =
|
|
67
|
+
BlueStackSettings.Instance.IOSMediationNetworks.Union(iOSMediationNetworkDependencies).ToList();
|
|
68
|
+
|
|
67
69
|
DependencyProvider.UpdateMediationNetworkDependencies(new IOSDependencyModifier(),
|
|
68
|
-
BlueStackSettings.Instance.
|
|
70
|
+
BlueStackSettings.Instance.IOSMediationNetworks);
|
|
69
71
|
}
|
|
70
72
|
|
|
71
73
|
public override void OnInspectorGUI()
|
|
@@ -76,11 +78,11 @@ namespace Azerion.BlueStack.Editor
|
|
|
76
78
|
EditorGUILayout.PropertyField(iOSAdmobAppIdProperty, new GUIContent("Admob AppId IOS: "));
|
|
77
79
|
EditorGUILayout.PropertyField(androidAdmobAppIdProperty, new GUIContent("Admob AppId Android: "));
|
|
78
80
|
EditorGUILayout.Separator();
|
|
79
|
-
EditorGUILayout.LabelField("
|
|
81
|
+
EditorGUILayout.LabelField("iOS Mediation Networks: ", EditorStyles.boldLabel);
|
|
80
82
|
|
|
81
|
-
foreach (var dependency in BlueStackSettings.Instance.
|
|
83
|
+
foreach (var dependency in BlueStackSettings.Instance.IOSMediationNetworks)
|
|
82
84
|
{
|
|
83
|
-
dependency.Print();
|
|
85
|
+
// dependency.Print();
|
|
84
86
|
bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.Active, dependency.Name);
|
|
85
87
|
if (newAutomaticConfigurationFilesUpdate != dependency.Active)
|
|
86
88
|
{
|
|
@@ -91,7 +93,7 @@ namespace Azerion.BlueStack.Editor
|
|
|
91
93
|
if (EditorGUI.EndChangeCheck())
|
|
92
94
|
{
|
|
93
95
|
DependencyProvider.UpdateMediationNetworkDependencies(new IOSDependencyModifier(),
|
|
94
|
-
BlueStackSettings.Instance.
|
|
96
|
+
BlueStackSettings.Instance.IOSMediationNetworks);
|
|
95
97
|
// serializedObject.ApplyModifiedProperties();
|
|
96
98
|
}
|
|
97
99
|
|
|
@@ -70,9 +70,9 @@ namespace Azerion.BlueStack.Editor
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
public static void
|
|
73
|
+
public static void SyncMediationDependencies()
|
|
74
74
|
{
|
|
75
|
-
//
|
|
75
|
+
// Copy from the source
|
|
76
76
|
CopyDependenciesXMLFileToAssets();
|
|
77
77
|
if (CopyMediationDependenciesXMLFileToAssets())
|
|
78
78
|
{
|
|
@@ -93,13 +93,11 @@ namespace Azerion.BlueStack.Editor
|
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
// Update Main Dependency XML
|
|
96
|
-
// UpdateMainXML(mainDependencyXML, updateDependencyXML);
|
|
96
|
+
// UpdateMainXML(mainDependencyXML, updateDependencyXML); // TODO
|
|
97
|
+
|
|
98
|
+
// add nodes in mainDependencyXML present in updateDependencyXML
|
|
97
99
|
XmlNodeList updateNodes = updateDependencyXML.SelectNodes("//network");
|
|
98
|
-
|
|
99
|
-
if (updateNodes == null || updateNodes.Count < 1)
|
|
100
|
-
{
|
|
101
|
-
return;
|
|
102
|
-
}
|
|
100
|
+
if (updateNodes == null || updateNodes.Count < 1) return;
|
|
103
101
|
|
|
104
102
|
foreach (XmlNode updateNode in updateNodes)
|
|
105
103
|
{
|
|
@@ -118,8 +116,7 @@ namespace Azerion.BlueStack.Editor
|
|
|
118
116
|
XmlNodeList mainNodes = mainDependencyXML.SelectNodes("//network");
|
|
119
117
|
foreach (XmlNode mainNode in mainNodes)
|
|
120
118
|
{
|
|
121
|
-
XmlNode updateNode =
|
|
122
|
-
updateDependencyXML.SelectSingleNode($"//network[@name='{mainNode.Attributes["name"].Value}']");
|
|
119
|
+
XmlNode updateNode = updateDependencyXML.SelectSingleNode($"//{mainNode.ParentNode.Name}/network[@name='{mainNode.Attributes["name"].Value}']");
|
|
123
120
|
|
|
124
121
|
if (updateNode == null)
|
|
125
122
|
{
|
|
@@ -130,14 +127,9 @@ namespace Azerion.BlueStack.Editor
|
|
|
130
127
|
// Save the modified main XML
|
|
131
128
|
SaveMainXMLFile(mainDependencyXML.OuterXml);
|
|
132
129
|
|
|
133
|
-
Debug.Log("Mediation Dependency XML files merged and updated successfully.");
|
|
130
|
+
// Debug.Log("Mediation Dependency XML files merged and updated successfully.");
|
|
134
131
|
}
|
|
135
|
-
|
|
136
|
-
private static void CopyMediationDependencyXML()
|
|
137
|
-
{
|
|
138
|
-
|
|
139
|
-
}
|
|
140
|
-
|
|
132
|
+
|
|
141
133
|
public static void UpdateMediationDependencyXML(List<MediationNetworkDependency> dependencies)
|
|
142
134
|
{
|
|
143
135
|
// if file doesn't exists, return
|
|
@@ -196,29 +188,33 @@ namespace Azerion.BlueStack.Editor
|
|
|
196
188
|
AssetDatabase.Refresh();
|
|
197
189
|
}
|
|
198
190
|
|
|
199
|
-
|
|
191
|
+
private static void CopyDependenciesXMLFileToAssets()
|
|
192
|
+
{
|
|
193
|
+
Directory.CreateDirectory(_editorPathInAssets);
|
|
194
|
+
FileUtil.ReplaceFile(_dependencyPathInPackage, _dependencyPathInAssets);
|
|
195
|
+
AssetDatabase.Refresh();
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
private static bool CopyMediationDependenciesXMLFileToAssets()
|
|
200
199
|
{
|
|
201
|
-
if (!File.Exists(
|
|
200
|
+
if (!File.Exists(_mediationDependencyPathInAssets))
|
|
202
201
|
{
|
|
203
202
|
Directory.CreateDirectory(_editorPathInAssets);
|
|
204
|
-
FileUtil.CopyFileOrDirectory(
|
|
203
|
+
FileUtil.CopyFileOrDirectory(_mediationDependencyPathInPackage, _mediationDependencyPathInAssets);
|
|
205
204
|
AssetDatabase.Refresh();
|
|
206
205
|
return true;
|
|
207
206
|
}
|
|
208
|
-
|
|
209
207
|
return false;
|
|
210
208
|
}
|
|
211
209
|
|
|
212
|
-
public static
|
|
210
|
+
public static void PrintDependencies(List<MediationNetworkDependency> dependencies)
|
|
213
211
|
{
|
|
214
|
-
|
|
212
|
+
Debug.Log($"====================={dependencies.Count}=====================>");
|
|
213
|
+
foreach (MediationNetworkDependency dependency in dependencies)
|
|
215
214
|
{
|
|
216
|
-
|
|
217
|
-
FileUtil.CopyFileOrDirectory(_mediationDependencyPathInPackage, _mediationDependencyPathInAssets);
|
|
218
|
-
AssetDatabase.Refresh();
|
|
219
|
-
return true;
|
|
215
|
+
Debug.Log($"Network Name: {dependency.Name}, Package: {dependency.Package}, Status: {dependency.Active}");
|
|
220
216
|
}
|
|
221
|
-
|
|
217
|
+
Debug.Log("<==========================================");
|
|
222
218
|
}
|
|
223
219
|
}
|
|
224
220
|
}
|
|
@@ -15,17 +15,8 @@ namespace Azerion.BlueStack.Editor
|
|
|
15
15
|
|
|
16
16
|
public string Name { get; set; }
|
|
17
17
|
public string Package { get; set; }
|
|
18
|
-
|
|
19
|
-
// [SerializeField]
|
|
20
18
|
public bool Active { get; set; }
|
|
21
19
|
|
|
22
|
-
// [SerializeField] private bool active;
|
|
23
|
-
// public bool Active
|
|
24
|
-
// {
|
|
25
|
-
// get => active;
|
|
26
|
-
// set => active = value;
|
|
27
|
-
// }
|
|
28
|
-
|
|
29
20
|
public void Print()
|
|
30
21
|
{
|
|
31
22
|
Debug.Log("Name: " + Name + "Package: " + Package + "Active: " + Active);
|
|
@@ -54,7 +54,7 @@ namespace Azerion.BlueStack.Editor.iOS
|
|
|
54
54
|
System.IO.File.WriteAllText(xmlFilePath, xmlDoc.OuterXml);
|
|
55
55
|
AssetDatabase.Refresh();
|
|
56
56
|
|
|
57
|
-
Debug.Log("Mediation Dependencies are updated successfully in Main Dependencies XML.");
|
|
57
|
+
// Debug.Log("Mediation Dependencies are updated successfully in Main Dependencies XML.");
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
void IDependencyModifier.modifyMediationNetworkDependencies(string xmlFilePath,
|
|
@@ -92,7 +92,7 @@ namespace Azerion.BlueStack.Editor.iOS
|
|
|
92
92
|
// Replace main mediation dependency XML content with the modified XML
|
|
93
93
|
System.IO.File.WriteAllText(xmlFilePath, xmlDoc.OuterXml);
|
|
94
94
|
AssetDatabase.Refresh();
|
|
95
|
-
Debug.Log("Mediation Network Dependencies XML file updated successfully.");
|
|
95
|
+
// Debug.Log("Mediation Network Dependencies XML file updated successfully.");
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
private static void SaveMainXMLFile(string updatedXML, string path)
|
|
@@ -53,9 +53,9 @@ namespace Azerion.BlueStack.Editor.iOS
|
|
|
53
53
|
var package = packageAttribute.Value;
|
|
54
54
|
var active = bool.Parse(activeAttribute.Value);
|
|
55
55
|
|
|
56
|
-
Debug.Log("name: " + name);
|
|
57
|
-
Debug.Log("package: " + package);
|
|
58
|
-
Debug.Log("active: " + active);
|
|
56
|
+
// Debug.Log("name: " + name);
|
|
57
|
+
// Debug.Log("package: " + package);
|
|
58
|
+
// Debug.Log("active: " + active);
|
|
59
59
|
dependencies.Add(new MediationNetworkDependency(name, package, active));
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -23,6 +23,8 @@ namespace Azerion.BlueStack.Example
|
|
|
23
23
|
return "3180317"; //3180317
|
|
24
24
|
#elif UNITY_ANDROID
|
|
25
25
|
return "5180317";
|
|
26
|
+
#else
|
|
27
|
+
return "unexpected_platform";
|
|
26
28
|
#endif
|
|
27
29
|
}
|
|
28
30
|
}
|
|
@@ -35,6 +37,8 @@ namespace Azerion.BlueStack.Example
|
|
|
35
37
|
return "/" + AppId + "/nativeadmng";
|
|
36
38
|
#elif UNITY_ANDROID
|
|
37
39
|
return "/" + AppId + "/nativead";
|
|
40
|
+
#else
|
|
41
|
+
return "unexpected_platform";
|
|
38
42
|
#endif
|
|
39
43
|
}
|
|
40
44
|
}
|
|
@@ -23,6 +23,8 @@ namespace Azerion.BlueStack.Example
|
|
|
23
23
|
return "3180317"; //3180317
|
|
24
24
|
#elif UNITY_ANDROID
|
|
25
25
|
return "5180317";
|
|
26
|
+
#else
|
|
27
|
+
return "unexpected_platform";
|
|
26
28
|
#endif
|
|
27
29
|
}
|
|
28
30
|
}
|
|
@@ -35,6 +37,8 @@ namespace Azerion.BlueStack.Example
|
|
|
35
37
|
return "/" + AppId + "/nativead";
|
|
36
38
|
#elif UNITY_ANDROID
|
|
37
39
|
return "/" + AppId + "/nativead";
|
|
40
|
+
#else
|
|
41
|
+
return "unexpected_platform";
|
|
38
42
|
#endif
|
|
39
43
|
}
|
|
40
44
|
}
|
|
@@ -29,14 +29,14 @@ RectTransform:
|
|
|
29
29
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
30
30
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
31
31
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
32
|
+
m_ConstrainProportionsScale: 0
|
|
32
33
|
m_Children: []
|
|
33
34
|
m_Father: {fileID: 224975965904302652}
|
|
34
|
-
m_RootOrder: 0
|
|
35
35
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
36
36
|
m_AnchorMin: {x: 0.5, y: 0}
|
|
37
37
|
m_AnchorMax: {x: 0.5, y: 0}
|
|
38
|
-
m_AnchoredPosition: {x: 0, y:
|
|
39
|
-
m_SizeDelta: {x:
|
|
38
|
+
m_AnchoredPosition: {x: 0, y: 87.5}
|
|
39
|
+
m_SizeDelta: {x: 1120, y: 175}
|
|
40
40
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
41
41
|
--- !u!222 &222746751799034550
|
|
42
42
|
CanvasRenderer:
|
|
@@ -149,10 +149,10 @@ RectTransform:
|
|
|
149
149
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
150
150
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
151
151
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
152
|
+
m_ConstrainProportionsScale: 0
|
|
152
153
|
m_Children:
|
|
153
154
|
- {fileID: 224102598220924924}
|
|
154
155
|
m_Father: {fileID: 0}
|
|
155
|
-
m_RootOrder: 0
|
|
156
156
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
157
157
|
m_AnchorMin: {x: 0, y: 0}
|
|
158
158
|
m_AnchorMax: {x: 0, y: 0}
|
|
@@ -176,7 +176,9 @@ Canvas:
|
|
|
176
176
|
m_OverrideSorting: 0
|
|
177
177
|
m_OverridePixelPerfect: 0
|
|
178
178
|
m_SortingBucketNormalizedSize: 0
|
|
179
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
179
180
|
m_AdditionalShaderChannelsFlag: 0
|
|
181
|
+
m_UpdateRectTransformForStandalone: 0
|
|
180
182
|
m_SortingLayerID: 0
|
|
181
183
|
m_SortingOrder: 100
|
|
182
184
|
m_TargetDisplay: 0
|
|
@@ -212,9 +214,9 @@ MonoBehaviour:
|
|
|
212
214
|
m_UiScaleMode: 1
|
|
213
215
|
m_ReferencePixelsPerUnit: 100
|
|
214
216
|
m_ScaleFactor: 1
|
|
215
|
-
m_ReferenceResolution: {x: 1440, y:
|
|
217
|
+
m_ReferenceResolution: {x: 1440, y: 2560}
|
|
216
218
|
m_ScreenMatchMode: 0
|
|
217
|
-
m_MatchWidthOrHeight:
|
|
219
|
+
m_MatchWidthOrHeight: 0.5
|
|
218
220
|
m_PhysicalUnit: 3
|
|
219
221
|
m_FallbackScreenDPI: 96
|
|
220
222
|
m_DefaultSpriteDPI: 96
|
|
@@ -29,16 +29,16 @@ RectTransform:
|
|
|
29
29
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
30
30
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
31
31
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
32
|
+
m_ConstrainProportionsScale: 0
|
|
32
33
|
m_Children:
|
|
33
34
|
- {fileID: 224233332446998570}
|
|
34
35
|
- {fileID: 2527966602407694077}
|
|
35
36
|
m_Father: {fileID: 224156852809508418}
|
|
36
|
-
m_RootOrder: 0
|
|
37
37
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
38
38
|
m_AnchorMin: {x: 0.5, y: 0}
|
|
39
39
|
m_AnchorMax: {x: 0.5, y: 0}
|
|
40
|
-
m_AnchoredPosition: {x: 0, y:
|
|
41
|
-
m_SizeDelta: {x:
|
|
40
|
+
m_AnchoredPosition: {x: 0, y: 87.5}
|
|
41
|
+
m_SizeDelta: {x: 1440, y: 175}
|
|
42
42
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
43
43
|
--- !u!222 &222779771472130718
|
|
44
44
|
CanvasRenderer:
|
|
@@ -150,13 +150,13 @@ RectTransform:
|
|
|
150
150
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
151
151
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
152
152
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
153
|
+
m_ConstrainProportionsScale: 0
|
|
153
154
|
m_Children: []
|
|
154
155
|
m_Father: {fileID: 224490741999108352}
|
|
155
|
-
m_RootOrder: 0
|
|
156
156
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
157
157
|
m_AnchorMin: {x: 0.5, y: 0}
|
|
158
158
|
m_AnchorMax: {x: 0.5, y: 0}
|
|
159
|
-
m_AnchoredPosition: {x:
|
|
159
|
+
m_AnchoredPosition: {x: 0, y: 80}
|
|
160
160
|
m_SizeDelta: {x: 400, y: 100}
|
|
161
161
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
162
162
|
--- !u!222 &222910655472497136
|
|
@@ -230,10 +230,10 @@ RectTransform:
|
|
|
230
230
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
231
231
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
232
232
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
233
|
+
m_ConstrainProportionsScale: 0
|
|
233
234
|
m_Children:
|
|
234
235
|
- {fileID: 224490741999108352}
|
|
235
236
|
m_Father: {fileID: 0}
|
|
236
|
-
m_RootOrder: 0
|
|
237
237
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
238
238
|
m_AnchorMin: {x: 0, y: 0}
|
|
239
239
|
m_AnchorMax: {x: 0, y: 0}
|
|
@@ -257,7 +257,9 @@ Canvas:
|
|
|
257
257
|
m_OverrideSorting: 0
|
|
258
258
|
m_OverridePixelPerfect: 0
|
|
259
259
|
m_SortingBucketNormalizedSize: 0
|
|
260
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
260
261
|
m_AdditionalShaderChannelsFlag: 0
|
|
262
|
+
m_UpdateRectTransformForStandalone: 0
|
|
261
263
|
m_SortingLayerID: 0
|
|
262
264
|
m_SortingOrder: 100
|
|
263
265
|
m_TargetDisplay: 0
|
|
@@ -293,7 +295,7 @@ MonoBehaviour:
|
|
|
293
295
|
m_UiScaleMode: 1
|
|
294
296
|
m_ReferencePixelsPerUnit: 100
|
|
295
297
|
m_ScaleFactor: 1
|
|
296
|
-
m_ReferenceResolution: {x:
|
|
298
|
+
m_ReferenceResolution: {x: 1440, y: 2560}
|
|
297
299
|
m_ScreenMatchMode: 0
|
|
298
300
|
m_MatchWidthOrHeight: 0.5
|
|
299
301
|
m_PhysicalUnit: 3
|
|
@@ -329,13 +331,13 @@ RectTransform:
|
|
|
329
331
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
|
330
332
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
331
333
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
334
|
+
m_ConstrainProportionsScale: 0
|
|
332
335
|
m_Children: []
|
|
333
336
|
m_Father: {fileID: 224490741999108352}
|
|
334
|
-
m_RootOrder: 1
|
|
335
337
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
336
338
|
m_AnchorMin: {x: 0.5, y: 1}
|
|
337
339
|
m_AnchorMax: {x: 0.5, y: 1}
|
|
338
|
-
m_AnchoredPosition: {x: 0, y: -
|
|
340
|
+
m_AnchoredPosition: {x: 0, y: -40}
|
|
339
341
|
m_SizeDelta: {x: 260, y: 37}
|
|
340
342
|
m_Pivot: {x: 0.5, y: 1}
|
|
341
343
|
--- !u!222 &754689629187967066
|
|
@@ -29,14 +29,14 @@ RectTransform:
|
|
|
29
29
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
30
30
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
31
31
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
32
|
+
m_ConstrainProportionsScale: 0
|
|
32
33
|
m_Children: []
|
|
33
34
|
m_Father: {fileID: 224276549256597394}
|
|
34
|
-
m_RootOrder: 0
|
|
35
35
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
36
|
-
m_AnchorMin: {x: 0.5, y: 0
|
|
37
|
-
m_AnchorMax: {x: 0.5, y: 0
|
|
38
|
-
m_AnchoredPosition: {x: 0, y:
|
|
39
|
-
m_SizeDelta: {x:
|
|
36
|
+
m_AnchorMin: {x: 0.5, y: 0}
|
|
37
|
+
m_AnchorMax: {x: 0.5, y: 0}
|
|
38
|
+
m_AnchoredPosition: {x: 0, y: 105}
|
|
39
|
+
m_SizeDelta: {x: 1638, y: 210}
|
|
40
40
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
41
41
|
--- !u!222 &222144676729818894
|
|
42
42
|
CanvasRenderer:
|
|
@@ -149,10 +149,10 @@ RectTransform:
|
|
|
149
149
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
150
150
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
151
151
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
152
|
+
m_ConstrainProportionsScale: 0
|
|
152
153
|
m_Children:
|
|
153
154
|
- {fileID: 224722748174579388}
|
|
154
155
|
m_Father: {fileID: 0}
|
|
155
|
-
m_RootOrder: 0
|
|
156
156
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
157
157
|
m_AnchorMin: {x: 0, y: 0}
|
|
158
158
|
m_AnchorMax: {x: 0, y: 0}
|
|
@@ -176,7 +176,9 @@ Canvas:
|
|
|
176
176
|
m_OverrideSorting: 0
|
|
177
177
|
m_OverridePixelPerfect: 0
|
|
178
178
|
m_SortingBucketNormalizedSize: 0
|
|
179
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
179
180
|
m_AdditionalShaderChannelsFlag: 0
|
|
181
|
+
m_UpdateRectTransformForStandalone: 0
|
|
180
182
|
m_SortingLayerID: 0
|
|
181
183
|
m_SortingOrder: 100
|
|
182
184
|
m_TargetDisplay: 0
|
|
@@ -212,9 +214,9 @@ MonoBehaviour:
|
|
|
212
214
|
m_UiScaleMode: 1
|
|
213
215
|
m_ReferencePixelsPerUnit: 100
|
|
214
216
|
m_ScaleFactor: 1
|
|
215
|
-
m_ReferenceResolution: {x:
|
|
217
|
+
m_ReferenceResolution: {x: 1440, y: 2560}
|
|
216
218
|
m_ScreenMatchMode: 0
|
|
217
|
-
m_MatchWidthOrHeight:
|
|
219
|
+
m_MatchWidthOrHeight: 0.5
|
|
218
220
|
m_PhysicalUnit: 3
|
|
219
221
|
m_FallbackScreenDPI: 96
|
|
220
222
|
m_DefaultSpriteDPI: 96
|
|
@@ -29,14 +29,14 @@ RectTransform:
|
|
|
29
29
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
30
30
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
31
31
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
32
|
+
m_ConstrainProportionsScale: 0
|
|
32
33
|
m_Children: []
|
|
33
34
|
m_Father: {fileID: 224970415831850420}
|
|
34
|
-
m_RootOrder: 0
|
|
35
35
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
36
|
-
m_AnchorMin: {x: 0.5, y: 0
|
|
37
|
-
m_AnchorMax: {x: 0.5, y: 0
|
|
38
|
-
m_AnchoredPosition: {x: 0, y:
|
|
39
|
-
m_SizeDelta: {x:
|
|
36
|
+
m_AnchorMin: {x: 0.5, y: 0}
|
|
37
|
+
m_AnchorMax: {x: 0.5, y: 0}
|
|
38
|
+
m_AnchoredPosition: {x: 0, y: 175}
|
|
39
|
+
m_SizeDelta: {x: 1120, y: 350}
|
|
40
40
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
41
41
|
--- !u!222 &222213910864577190
|
|
42
42
|
CanvasRenderer:
|
|
@@ -149,10 +149,10 @@ RectTransform:
|
|
|
149
149
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
150
150
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
151
151
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
152
|
+
m_ConstrainProportionsScale: 0
|
|
152
153
|
m_Children:
|
|
153
154
|
- {fileID: 224967535306520620}
|
|
154
155
|
m_Father: {fileID: 0}
|
|
155
|
-
m_RootOrder: 0
|
|
156
156
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
157
157
|
m_AnchorMin: {x: 0, y: 0}
|
|
158
158
|
m_AnchorMax: {x: 0, y: 0}
|
|
@@ -176,7 +176,9 @@ Canvas:
|
|
|
176
176
|
m_OverrideSorting: 0
|
|
177
177
|
m_OverridePixelPerfect: 0
|
|
178
178
|
m_SortingBucketNormalizedSize: 0
|
|
179
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
179
180
|
m_AdditionalShaderChannelsFlag: 0
|
|
181
|
+
m_UpdateRectTransformForStandalone: 0
|
|
180
182
|
m_SortingLayerID: 0
|
|
181
183
|
m_SortingOrder: 100
|
|
182
184
|
m_TargetDisplay: 0
|
|
@@ -212,9 +214,9 @@ MonoBehaviour:
|
|
|
212
214
|
m_UiScaleMode: 1
|
|
213
215
|
m_ReferencePixelsPerUnit: 100
|
|
214
216
|
m_ScaleFactor: 1
|
|
215
|
-
m_ReferenceResolution: {x: 1440, y:
|
|
217
|
+
m_ReferenceResolution: {x: 1440, y: 2560}
|
|
216
218
|
m_ScreenMatchMode: 0
|
|
217
|
-
m_MatchWidthOrHeight:
|
|
219
|
+
m_MatchWidthOrHeight: 0.5
|
|
218
220
|
m_PhysicalUnit: 3
|
|
219
221
|
m_FallbackScreenDPI: 96
|
|
220
222
|
m_DefaultSpriteDPI: 96
|
|
@@ -29,14 +29,14 @@ RectTransform:
|
|
|
29
29
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
30
30
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
31
31
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
32
|
+
m_ConstrainProportionsScale: 0
|
|
32
33
|
m_Children: []
|
|
33
34
|
m_Father: {fileID: 224006990116994490}
|
|
34
|
-
m_RootOrder: 0
|
|
35
35
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
36
36
|
m_AnchorMin: {x: 0.5, y: 0}
|
|
37
37
|
m_AnchorMax: {x: 0.5, y: 0}
|
|
38
|
-
m_AnchoredPosition: {x: 0, y:
|
|
39
|
-
m_SizeDelta: {x:
|
|
38
|
+
m_AnchoredPosition: {x: 0, y: 157.5}
|
|
39
|
+
m_SizeDelta: {x: 2548, y: 315}
|
|
40
40
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
41
41
|
--- !u!222 &222129017442517786
|
|
42
42
|
CanvasRenderer:
|
|
@@ -149,10 +149,10 @@ RectTransform:
|
|
|
149
149
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
150
150
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
151
151
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
152
|
+
m_ConstrainProportionsScale: 0
|
|
152
153
|
m_Children:
|
|
153
154
|
- {fileID: 224697483211628194}
|
|
154
155
|
m_Father: {fileID: 0}
|
|
155
|
-
m_RootOrder: 0
|
|
156
156
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
157
157
|
m_AnchorMin: {x: 0, y: 0}
|
|
158
158
|
m_AnchorMax: {x: 0, y: 0}
|
|
@@ -176,7 +176,9 @@ Canvas:
|
|
|
176
176
|
m_OverrideSorting: 0
|
|
177
177
|
m_OverridePixelPerfect: 0
|
|
178
178
|
m_SortingBucketNormalizedSize: 0
|
|
179
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
179
180
|
m_AdditionalShaderChannelsFlag: 0
|
|
181
|
+
m_UpdateRectTransformForStandalone: 0
|
|
180
182
|
m_SortingLayerID: 0
|
|
181
183
|
m_SortingOrder: 100
|
|
182
184
|
m_TargetDisplay: 0
|
|
@@ -212,9 +214,9 @@ MonoBehaviour:
|
|
|
212
214
|
m_UiScaleMode: 1
|
|
213
215
|
m_ReferencePixelsPerUnit: 100
|
|
214
216
|
m_ScaleFactor: 1
|
|
215
|
-
m_ReferenceResolution: {x:
|
|
217
|
+
m_ReferenceResolution: {x: 1440, y: 2560}
|
|
216
218
|
m_ScreenMatchMode: 0
|
|
217
|
-
m_MatchWidthOrHeight:
|
|
219
|
+
m_MatchWidthOrHeight: 0.5
|
|
218
220
|
m_PhysicalUnit: 3
|
|
219
221
|
m_FallbackScreenDPI: 96
|
|
220
222
|
m_DefaultSpriteDPI: 96
|
|
@@ -29,10 +29,10 @@ RectTransform:
|
|
|
29
29
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
30
30
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
31
31
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
32
|
+
m_ConstrainProportionsScale: 0
|
|
32
33
|
m_Children:
|
|
33
34
|
- {fileID: 224894678874208494}
|
|
34
35
|
m_Father: {fileID: 0}
|
|
35
|
-
m_RootOrder: 0
|
|
36
36
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
37
37
|
m_AnchorMin: {x: 0, y: 0}
|
|
38
38
|
m_AnchorMax: {x: 0, y: 0}
|
|
@@ -56,7 +56,9 @@ Canvas:
|
|
|
56
56
|
m_OverrideSorting: 0
|
|
57
57
|
m_OverridePixelPerfect: 0
|
|
58
58
|
m_SortingBucketNormalizedSize: 0
|
|
59
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
59
60
|
m_AdditionalShaderChannelsFlag: 0
|
|
61
|
+
m_UpdateRectTransformForStandalone: 0
|
|
60
62
|
m_SortingLayerID: 0
|
|
61
63
|
m_SortingOrder: 100
|
|
62
64
|
m_TargetDisplay: 0
|
|
@@ -92,9 +94,9 @@ MonoBehaviour:
|
|
|
92
94
|
m_UiScaleMode: 1
|
|
93
95
|
m_ReferencePixelsPerUnit: 100
|
|
94
96
|
m_ScaleFactor: 1
|
|
95
|
-
m_ReferenceResolution: {x:
|
|
97
|
+
m_ReferenceResolution: {x: 1440, y: 2560}
|
|
96
98
|
m_ScreenMatchMode: 0
|
|
97
|
-
m_MatchWidthOrHeight:
|
|
99
|
+
m_MatchWidthOrHeight: 0.5
|
|
98
100
|
m_PhysicalUnit: 3
|
|
99
101
|
m_FallbackScreenDPI: 96
|
|
100
102
|
m_DefaultSpriteDPI: 96
|
|
@@ -129,14 +131,14 @@ RectTransform:
|
|
|
129
131
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
130
132
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
131
133
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
134
|
+
m_ConstrainProportionsScale: 0
|
|
132
135
|
m_Children: []
|
|
133
136
|
m_Father: {fileID: 224538654718470302}
|
|
134
|
-
m_RootOrder: 0
|
|
135
137
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
136
138
|
m_AnchorMin: {x: 0.5, y: 0}
|
|
137
139
|
m_AnchorMax: {x: 0.5, y: 0}
|
|
138
|
-
m_AnchoredPosition: {x: 0, y:
|
|
139
|
-
m_SizeDelta: {x:
|
|
140
|
+
m_AnchoredPosition: {x: 0, y: 437.5}
|
|
141
|
+
m_SizeDelta: {x: 1050, y: 875}
|
|
140
142
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
141
143
|
--- !u!222 &222075172098901274
|
|
142
144
|
CanvasRenderer:
|
package/package.json
CHANGED