Skip to content

Commit 3c8734e

Browse files
Andronovo-bitalihan98ersoy
Andronovo-bit
authored and
alihan98ersoy
committed
Merge branch 'master' into 2.0-2018v2.3.5
Update Huawei version and add new files
1 parent b1ea598 commit 3c8734e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2974
-950
lines changed

‎.github/workflows/IssueLabeling.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Label issues
2+
on:
3+
issues:
4+
types:
5+
- opened
6+
jobs:
7+
label_issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
steps:
12+
- uses: actions/github-script@v6
13+
with:
14+
script: |
15+
github.rest.issues.addLabels({
16+
issue_number: context.issue.number,
17+
owner: context.repo.owner,
18+
repo: context.repo.repo,
19+
labels: ["new"]
20+
})
21+
auto-assign:
22+
runs-on: ubuntu-latest
23+
permissions:
24+
issues: write
25+
steps:
26+
- name: 'Auto-assign issue'
27+
uses: pozil/auto-assign-issue@v1
28+
with:
29+
assignees: alihan98ersoy
30+
allowSelfAssign: true
31+
add-comment:
32+
runs-on: ubuntu-latest
33+
permissions:
34+
issues: write
35+
steps:
36+
- name: Add comment
37+
uses: peter-evans/create-or-update-comment@5f728c3dae25f329afbe34ee4d08eef25569d79f
38+
with:
39+
issue-number: ${{ github.event.issue.number }}
40+
body: |
41+
&nbsp;Thank you for reporting this **issue/advice**. <br>We will get back to you as soon as possible. <br>&emsp;&emsp;&emsp;&emsp;Would you like to star our plugin <br>&emsp;&emsp;&emsp;to support us?:sparkles:
42+

‎.github/workflows/ask-for-star.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Add comment to solved and closed issues
2+
3+
on:
4+
issues:
5+
types: [closed]
6+
labels:
7+
- solved
8+
9+
jobs:
10+
add-comment:
11+
permissions: write-all
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v3
17+
18+
- name: Add comment to issue
19+
uses: peter-evans/create-or-update-comment@v2
20+
with:
21+
token: ${{ secrets.GITHUB_TOKEN }}
22+
issue-number: ${{ github.event.issue.number }}
23+
comment-id: ${{ github.event.comment.id }}
24+
repository: EvilMindDevs/hms-unity-plugin
25+
body: |
26+
Thank you for using our repository! We're glad we could help solve your issue. If you found our repository helpful, please consider giving us a star ⭐ on GitHub: https://github.com/EvilMindDevs/hms-unity-plugin
27+
28+
Your support helps us continue to improve our repository and provide valuable resources for others.

‎Assets/Huawei/Demos/Ads/AdsDemo.unity‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1974,3 +1974,127 @@ MonoBehaviour:
19741974
m_Script: {fileID: 11500000, guid: f85aefbe901c01d4ba36430feb743a38, type: 3}
19751975
m_Name:
19761976
m_EditorClassIdentifier:
1977+
--- !u!1001 &1424579276961344258
1978+
PrefabInstance:
1979+
m_ObjectHideFlags: 0
1980+
serializedVersion: 2
1981+
m_Modification:
1982+
m_TransformParent: {fileID: 537667486}
1983+
m_Modifications:
1984+
- target: {fileID: 1424579275220415068, guid: 56b6d4ff652465242a9c0dc8eee87809,
1985+
type: 3}
1986+
propertyPath: adUnitID
1987+
value: testy63txaom86
1988+
objectReference: {fileID: 0}
1989+
- target: {fileID: 1424579275220415070, guid: 56b6d4ff652465242a9c0dc8eee87809,
1990+
type: 3}
1991+
propertyPath: m_Name
1992+
value: native_large_image
1993+
objectReference: {fileID: 0}
1994+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
1995+
type: 3}
1996+
propertyPath: m_Pivot.x
1997+
value: 0.5
1998+
objectReference: {fileID: 0}
1999+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2000+
type: 3}
2001+
propertyPath: m_Pivot.y
2002+
value: 0.5
2003+
objectReference: {fileID: 0}
2004+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2005+
type: 3}
2006+
propertyPath: m_RootOrder
2007+
value: 7
2008+
objectReference: {fileID: 0}
2009+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2010+
type: 3}
2011+
propertyPath: m_AnchorMax.x
2012+
value: 0.5
2013+
objectReference: {fileID: 0}
2014+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2015+
type: 3}
2016+
propertyPath: m_AnchorMax.y
2017+
value: 0.5
2018+
objectReference: {fileID: 0}
2019+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2020+
type: 3}
2021+
propertyPath: m_AnchorMin.x
2022+
value: 0.5
2023+
objectReference: {fileID: 0}
2024+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2025+
type: 3}
2026+
propertyPath: m_AnchorMin.y
2027+
value: 0.5
2028+
objectReference: {fileID: 0}
2029+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2030+
type: 3}
2031+
propertyPath: m_SizeDelta.x
2032+
value: 576.1738
2033+
objectReference: {fileID: 0}
2034+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2035+
type: 3}
2036+
propertyPath: m_SizeDelta.y
2037+
value: 366.31525
2038+
objectReference: {fileID: 0}
2039+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2040+
type: 3}
2041+
propertyPath: m_LocalPosition.x
2042+
value: 0
2043+
objectReference: {fileID: 0}
2044+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2045+
type: 3}
2046+
propertyPath: m_LocalPosition.y
2047+
value: 0
2048+
objectReference: {fileID: 0}
2049+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2050+
type: 3}
2051+
propertyPath: m_LocalPosition.z
2052+
value: 0
2053+
objectReference: {fileID: 0}
2054+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2055+
type: 3}
2056+
propertyPath: m_LocalRotation.w
2057+
value: 1
2058+
objectReference: {fileID: 0}
2059+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2060+
type: 3}
2061+
propertyPath: m_LocalRotation.x
2062+
value: -0
2063+
objectReference: {fileID: 0}
2064+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2065+
type: 3}
2066+
propertyPath: m_LocalRotation.y
2067+
value: -0
2068+
objectReference: {fileID: 0}
2069+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2070+
type: 3}
2071+
propertyPath: m_LocalRotation.z
2072+
value: -0
2073+
objectReference: {fileID: 0}
2074+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2075+
type: 3}
2076+
propertyPath: m_AnchoredPosition.x
2077+
value: 0
2078+
objectReference: {fileID: 0}
2079+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2080+
type: 3}
2081+
propertyPath: m_AnchoredPosition.y
2082+
value: -350
2083+
objectReference: {fileID: 0}
2084+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2085+
type: 3}
2086+
propertyPath: m_LocalEulerAnglesHint.x
2087+
value: 0
2088+
objectReference: {fileID: 0}
2089+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2090+
type: 3}
2091+
propertyPath: m_LocalEulerAnglesHint.y
2092+
value: 0
2093+
objectReference: {fileID: 0}
2094+
- target: {fileID: 1424579275220415071, guid: 56b6d4ff652465242a9c0dc8eee87809,
2095+
type: 3}
2096+
propertyPath: m_LocalEulerAnglesHint.z
2097+
value: 0
2098+
objectReference: {fileID: 0}
2099+
m_RemovedComponents: []
2100+
m_SourcePrefab: {fileID: 100100000, guid: 56b6d4ff652465242a9c0dc8eee87809, type: 3}

‎Assets/Huawei/Demos/CloudStorage/CloudStorageDemo.unity‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RenderSettings:
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
46+
serializedVersion: 12
4747
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
@@ -89,7 +89,7 @@ LightmapSettings:
8989
m_PVRFilteringAtrousPositionSigmaAO: 1
9090
m_ShowResolutionOverlay: 1
9191
m_LightingDataAsset: {fileID: 0}
92-
m_UseShadowmask: 1
92+
m_LightingSettings: {fileID: 0}
9393
--- !u!196 &4
9494
NavMeshSettings:
9595
serializedVersion: 2
@@ -109,6 +109,8 @@ NavMeshSettings:
109109
manualTileSize: 0
110110
tileSize: 256
111111
accuratePlacement: 0
112+
maxJobWorkers: 0
113+
preserveTilesOutsideBounds: 0
112114
debug:
113115
m_Flags: 0
114116
m_NavMeshData: {fileID: 0}
@@ -279,6 +281,7 @@ MonoBehaviour:
279281
m_EditorClassIdentifier:
280282
m_Navigation:
281283
m_Mode: 3
284+
m_WrapAround: 0
282285
m_SelectOnUp: {fileID: 0}
283286
m_SelectOnDown: {fileID: 0}
284287
m_SelectOnLeft: {fileID: 0}

‎Assets/Huawei/Demos/IAP/IapDemo.unity‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,84 @@ MonoBehaviour:
698698
m_Script: {fileID: 11500000, guid: 0f7ee010b51766f429500be0fb8d9ef1, type: 3}
699699
m_Name:
700700
m_EditorClassIdentifier:
701+
--- !u!1 &2004270529
702+
GameObject:
703+
m_ObjectHideFlags: 0
704+
m_CorrespondingSourceObject: {fileID: 0}
705+
m_PrefabInstance: {fileID: 0}
706+
m_PrefabAsset: {fileID: 0}
707+
serializedVersion: 6
708+
m_Component:
709+
- component: {fileID: 2004270530}
710+
- component: {fileID: 2004270532}
711+
- component: {fileID: 2004270531}
712+
m_Layer: 5
713+
m_Name: Text
714+
m_TagString: Untagged
715+
m_Icon: {fileID: 0}
716+
m_NavMeshLayer: 0
717+
m_StaticEditorFlags: 0
718+
m_IsActive: 1
719+
--- !u!224 &2004270530
720+
RectTransform:
721+
m_ObjectHideFlags: 0
722+
m_CorrespondingSourceObject: {fileID: 0}
723+
m_PrefabInstance: {fileID: 0}
724+
m_PrefabAsset: {fileID: 0}
725+
m_GameObject: {fileID: 2004270529}
726+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
727+
m_LocalPosition: {x: 0, y: 0, z: 0}
728+
m_LocalScale: {x: 1, y: 1, z: 1}
729+
m_Children: []
730+
m_Father: {fileID: 1847605506}
731+
m_RootOrder: 0
732+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
733+
m_AnchorMin: {x: 0, y: 0}
734+
m_AnchorMax: {x: 1, y: 1}
735+
m_AnchoredPosition: {x: 0, y: 0}
736+
m_SizeDelta: {x: 0, y: 0}
737+
m_Pivot: {x: 0.5, y: 0.5}
738+
--- !u!114 &2004270531
739+
MonoBehaviour:
740+
m_ObjectHideFlags: 0
741+
m_CorrespondingSourceObject: {fileID: 0}
742+
m_PrefabInstance: {fileID: 0}
743+
m_PrefabAsset: {fileID: 0}
744+
m_GameObject: {fileID: 2004270529}
745+
m_Enabled: 1
746+
m_EditorHideFlags: 0
747+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
748+
m_Name:
749+
m_EditorClassIdentifier:
750+
m_Material: {fileID: 0}
751+
m_Color: {r: 1, g: 1, b: 1, a: 1}
752+
m_RaycastTarget: 1
753+
m_Maskable: 1
754+
m_OnCullStateChanged:
755+
m_PersistentCalls:
756+
m_Calls: []
757+
m_FontData:
758+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
759+
m_FontSize: 30
760+
m_FontStyle: 1
761+
m_BestFit: 0
762+
m_MinSize: 1
763+
m_MaxSize: 40
764+
m_Alignment: 4
765+
m_AlignByGeometry: 0
766+
m_RichText: 1
767+
m_HorizontalOverflow: 0
768+
m_VerticalOverflow: 0
769+
m_LineSpacing: 1
770+
m_Text: MANAGE Subscriptions
771+
--- !u!222 &2004270532
772+
CanvasRenderer:
773+
m_ObjectHideFlags: 0
774+
m_CorrespondingSourceObject: {fileID: 0}
775+
m_PrefabInstance: {fileID: 0}
776+
m_PrefabAsset: {fileID: 0}
777+
m_GameObject: {fileID: 2004270529}
778+
m_CullTransparentMesh: 0
701779
--- !u!1 &1541257161782053160
702780
GameObject:
703781
m_ObjectHideFlags: 0

‎Assets/Huawei/Demos/IAP/Second Demo-Menu_Store/MainMenuManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
using UnityEngine.SceneManagement;
88
using UnityEngine.UI;
99

10-
/* This demo scene has been created to show how to use IAP and Account kit in multiple scenes.
10+
/* You can find detailed explanation with medium article: https://medium.com/huawei-developers/guide-to-using-and-understanding-huawei-inapppurchases-demo-scene-in-unity-e41626d5b47a
11+
* This demo scene has been created to show how to use IAP and Account kit in multiple scenes.
1112
* Here are the steps to use this demo.
1213
* 1. Complete the quick start steps. https://evilminddevs.gitbook.io/hms-unity-plugin/getting-started/quick-start
1314
* 2. Enable Account kit - IAP from kit settings. https://evilminddevs.gitbook.io/hms-unity-plugin/getting-started/quick-start/connect-your-game-with-the-hms-kit-managers

‎Assets/Huawei/Demos/IAP/UnityDemo/UnityIapDemo.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ RectTransform:
262262
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
263263
m_AnchorMin: {x: 0.5, y: 0.5}
264264
m_AnchorMax: {x: 0.5, y: 0.5}
265-
m_AnchoredPosition: {x: 220, y: -580}
265+
m_AnchoredPosition: {x: -310, y: -437}
266266
m_SizeDelta: {x: 411.6499, y: 122.39276}
267267
m_Pivot: {x: 0.5, y: 0.5}
268268
--- !u!114 &144428408

0 commit comments

Comments
 (0)