Skip to content

Commit d538aeb

Browse files
committed
Unity commit
Unity commit
1 parent 4cf90d7 commit d538aeb

File tree

1,306 files changed

+104345
-215
lines changed

Some content is hidden

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

1,306 files changed

+104345
-215
lines changed

Source Project/Unity Singleton/Assembly-CSharp.csproj

Lines changed: 181 additions & 184 deletions
Large diffs are not rendered by default.
Binary file not shown.

Source Project/Unity Singleton/Library/CurrentLayout.dwlt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ MonoBehaviour:
135135
m_MinSize: {x: 740, y: 322}
136136
m_MaxSize: {x: 22010, y: 10000}
137137
vertical: 1
138-
controlID: 451
138+
controlID: 778
139139
--- !u!114 &7
140140
MonoBehaviour:
141141
m_ObjectHideFlags: 52
@@ -161,7 +161,7 @@ MonoBehaviour:
161161
m_MinSize: {x: 740, y: 322}
162162
m_MaxSize: {x: 22010, y: 10000}
163163
vertical: 0
164-
controlID: 452
164+
controlID: 779
165165
--- !u!114 &8
166166
MonoBehaviour:
167167
m_ObjectHideFlags: 52
@@ -212,7 +212,7 @@ MonoBehaviour:
212212
m_MinSize: {x: 208, y: 164}
213213
m_MaxSize: {x: 8008, y: 8044}
214214
vertical: 1
215-
controlID: 427
215+
controlID: 692
216216
--- !u!114 &10
217217
MonoBehaviour:
218218
m_ObjectHideFlags: 52
@@ -237,7 +237,7 @@ MonoBehaviour:
237237
m_MinSize: {x: 208, y: 42}
238238
m_MaxSize: {x: 8008, y: 4022}
239239
vertical: 0
240-
controlID: 366
240+
controlID: 693
241241
--- !u!114 &11
242242
MonoBehaviour:
243243
m_ObjectHideFlags: 52
@@ -315,7 +315,7 @@ MonoBehaviour:
315315
m_MinSize: {x: 208, y: 122}
316316
m_MaxSize: {x: 8008, y: 4022}
317317
vertical: 0
318-
controlID: 428
318+
controlID: 755
319319
--- !u!114 &14
320320
MonoBehaviour:
321321
m_ObjectHideFlags: 52
@@ -517,7 +517,7 @@ MonoBehaviour:
517517
m_ShowAllHits: 0
518518
m_SearchArea: 1
519519
m_Folders:
520-
- Packages
520+
- Assets/Scenes
521521
m_ViewMode: 0
522522
m_StartGridSize: 48
523523
m_LastFolders: []
@@ -530,7 +530,7 @@ MonoBehaviour:
530530
scrollPos: {x: 0, y: 0}
531531
m_SelectedIDs: 6e0c0000
532532
m_LastClickedID: 3182
533-
m_ExpandedIDs: ffffffff00000000a62a0000ffffff7f
533+
m_ExpandedIDs: ffffffff000000003632000064320000
534534
m_RenameOverlay:
535535
m_UserAcceptedRename: 0
536536
m_Name:
@@ -558,7 +558,7 @@ MonoBehaviour:
558558
scrollPos: {x: 0, y: 0}
559559
m_SelectedIDs:
560560
m_LastClickedID: 0
561-
m_ExpandedIDs: ffffffff00000000a62a0000ffffff7f
561+
m_ExpandedIDs: ffffffff000000003632000064320000
562562
m_RenameOverlay:
563563
m_UserAcceptedRename: 0
564564
m_Name:
@@ -644,7 +644,7 @@ MonoBehaviour:
644644
scrollPos: {x: 0, y: 0}
645645
m_SelectedIDs:
646646
m_LastClickedID: 0
647-
m_ExpandedIDs: 8efbffff
647+
m_ExpandedIDs: 5cf7ffffc0f8ffff
648648
m_RenameOverlay:
649649
m_UserAcceptedRename: 0
650650
m_Name:

Source Project/Unity Singleton/Library/CurrentMaximizeLayout.dwlt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ MonoBehaviour:
2323
m_MinSize: {x: 740, y: 322}
2424
m_MaxSize: {x: 22010, y: 10000}
2525
vertical: 1
26-
controlID: 230
26+
controlID: 518
2727
--- !u!114 &2
2828
MonoBehaviour:
2929
m_ObjectHideFlags: 52
@@ -130,7 +130,7 @@ MonoBehaviour:
130130
m_MinSize: {x: 740, y: 322}
131131
m_MaxSize: {x: 22010, y: 10000}
132132
vertical: 0
133-
controlID: 231
133+
controlID: 519
134134
--- !u!114 &4
135135
MonoBehaviour:
136136
m_ObjectHideFlags: 52
@@ -195,7 +195,7 @@ MonoBehaviour:
195195
m_ShowAllHits: 0
196196
m_SearchArea: 1
197197
m_Folders:
198-
- Packages
198+
- Assets/Scenes
199199
m_ViewMode: 0
200200
m_StartGridSize: 48
201201
m_LastFolders: []
@@ -208,7 +208,7 @@ MonoBehaviour:
208208
scrollPos: {x: 0, y: 0}
209209
m_SelectedIDs: 6e0c0000
210210
m_LastClickedID: 3182
211-
m_ExpandedIDs: 00000000a62a0000
211+
m_ExpandedIDs: ffffffff0000000036320000
212212
m_RenameOverlay:
213213
m_UserAcceptedRename: 0
214214
m_Name:
@@ -234,9 +234,9 @@ MonoBehaviour:
234234
m_ResourceFile:
235235
m_AssetTreeState:
236236
scrollPos: {x: 0, y: 0}
237-
m_SelectedIDs:
238-
m_LastClickedID: 0
239-
m_ExpandedIDs: ffffffff00000000a62a0000ffffff7f
237+
m_SelectedIDs: 62340000
238+
m_LastClickedID: 13410
239+
m_ExpandedIDs: ffffffff000000003632000064320000
240240
m_RenameOverlay:
241241
m_UserAcceptedRename: 0
242242
m_Name:
@@ -261,8 +261,8 @@ MonoBehaviour:
261261
m_Icon: {fileID: 0}
262262
m_ResourceFile:
263263
m_ListAreaState:
264-
m_SelectedInstanceIDs:
265-
m_LastClickedInstanceID: 0
264+
m_SelectedInstanceIDs: 62340000
265+
m_LastClickedInstanceID: 13410
266266
m_HadKeyboardFocusLastEvent: 1
267267
m_ExpandedInstanceIDs:
268268
m_RenameOverlay:
@@ -315,7 +315,7 @@ MonoBehaviour:
315315
m_MinSize: {x: 208, y: 164}
316316
m_MaxSize: {x: 8008, y: 8044}
317317
vertical: 1
318-
controlID: 232
318+
controlID: 393
319319
--- !u!114 &7
320320
MonoBehaviour:
321321
m_ObjectHideFlags: 52
@@ -340,7 +340,7 @@ MonoBehaviour:
340340
m_MinSize: {x: 208, y: 42}
341341
m_MaxSize: {x: 8008, y: 4022}
342342
vertical: 0
343-
controlID: 233
343+
controlID: 332
344344
--- !u!114 &8
345345
MonoBehaviour:
346346
m_ObjectHideFlags: 52
@@ -398,7 +398,7 @@ MonoBehaviour:
398398
scrollPos: {x: 0, y: 0}
399399
m_SelectedIDs:
400400
m_LastClickedID: 0
401-
m_ExpandedIDs: 8efbffff
401+
m_ExpandedIDs: 5cf7ffffc0f8ffff
402402
m_RenameOverlay:
403403
m_UserAcceptedRename: 0
404404
m_Name:
@@ -441,8 +441,8 @@ MonoBehaviour:
441441
y: 0
442442
width: 742
443443
height: 531
444-
m_MinSize: {x: 100, y: 20}
445-
m_MaxSize: {x: 4000, y: 4000}
444+
m_MinSize: {x: 104, y: 42}
445+
m_MaxSize: {x: 4004, y: 4022}
446446
m_ActualView: {fileID: 11}
447447
m_Panes:
448448
- {fileID: 11}
@@ -597,7 +597,7 @@ MonoBehaviour:
597597
m_MinSize: {x: 208, y: 122}
598598
m_MaxSize: {x: 8008, y: 4022}
599599
vertical: 0
600-
controlID: 210
600+
controlID: 394
601601
--- !u!114 &14
602602
MonoBehaviour:
603603
m_ObjectHideFlags: 52
@@ -617,8 +617,8 @@ MonoBehaviour:
617617
y: 0
618618
width: 547
619619
height: 416
620-
m_MinSize: {x: 104, y: 42}
621-
m_MaxSize: {x: 4004, y: 4022}
620+
m_MinSize: {x: 100, y: 20}
621+
m_MaxSize: {x: 4000, y: 4000}
622622
m_ActualView: {fileID: 15}
623623
m_Panes:
624624
- {fileID: 15}
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
sceneSetups: []
1+
sceneSetups:
2+
- path: Assets/Scenes/First_Scene.unity
3+
isLoaded: 1
4+
isActive: 1
5+
isSubScene: 0
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Changelog
2+
3+
## [2.3.1] - 2018-11-15
4+
5+
### Fixed
6+
7+
* Update to Ads SDK 2.3.0
8+
* Multithreaded Request API
9+
* SendEvent API for Ads and IAP SDK communication
10+
* New Unity integration
11+
12+
## [2.2.1] - 2017-04-192
13+
14+
### Fixed
15+
16+
* Fixed issues (iOS, Android)
17+
18+
## [2.2.0] - 2017-03-22
19+
20+
### Added
21+
22+
* IAP Promotion support (iOS, Android)
23+
24+
### Changed
25+
26+
* Improved cache handling (iOS, Android)
27+
* Increased flexibility showing different ad formats (iOS, Android)
28+
29+
### Fixed
30+
31+
* Fixed a couple of rare crashes (iOS)

Source Project/Unity Singleton/Library/PackageCache/[email protected]/CHANGELOG.md.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Integration guide for Unity
2+
3+
[Look here](https://unityads.unity3d.com/help/monetization/integration-guide-unity)

Source Project/Unity Singleton/Library/PackageCache/[email protected]/Documentation~/com.unity.ads.md.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source Project/Unity Singleton/Library/PackageCache/[email protected]/Editor.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)