Skip to content

Commit 8ce9472

Browse files
ashblueashblue
committed
chore(unity 2023 upgrade): bumped version and fixed warnings
No major changes. Just affects local development files.
1 parent 7c9b09b commit 8ce9472

File tree

9 files changed

+101
-98
lines changed

9 files changed

+101
-98
lines changed

‎Assets/Samples/DecoratorRepeatWithWait.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,34 @@
11
using CleverCrow.Fluid.BTs.Tasks;
22
using CleverCrow.Fluid.BTs.Trees;
33
using UnityEngine;
4-
using Random = UnityEngine.Random;
54

65
namespace CleverCrow.Fluid.BTs.Samples {
76
public class DecoratorRepeatWithWait : MonoBehaviour {
87
[SerializeField]
98
private BehaviorTree _tree;
109

10+
[Tooltip("Setting to success will cause the task to succeed")]
1111
[SerializeField]
12-
private bool _toggle;
12+
private bool _isTaskSuccess;
1313

1414
void Start () {
1515
_tree = new BehaviorTreeBuilder(gameObject)
1616
.RepeatForever()
1717
.Parallel()
1818

1919
.Sequence()
20-
.Do(() => {
21-
_toggle = true;
22-
return TaskStatus.Success;
23-
})
20+
.Do(() => TaskStatus.Success)
2421
.WaitTime()
25-
.Do(() => {
26-
_toggle = false;
27-
return TaskStatus.Success;
28-
})
22+
.Do(() => TaskStatus.Success)
2923
.WaitTime()
3024
.End()
3125

32-
.Sequence()
26+
.Sequence("Repeat until success is checked")
3327
.Do(() => TaskStatus.Success)
3428
.RepeatUntilSuccess()
3529
.Sequence()
3630
.WaitTime()
37-
.Do(() => Random.value > 0.5f ? TaskStatus.Success : TaskStatus.Failure)
31+
.Do(() => _isTaskSuccess ? TaskStatus.Success : TaskStatus.Failure)
3832
.End()
3933
.End()
4034
.End()

‎Packages/manifest.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
"clever-crow.nsubstitute": "2.0.3",
1313
"com.unity.2d.sprite": "1.0.0",
1414
"com.unity.2d.tilemap": "1.0.0",
15-
"com.unity.ads": "3.7.1",
16-
"com.unity.analytics": "3.5.3",
17-
"com.unity.collab-proxy": "1.5.7",
18-
"com.unity.ide.rider": "3.0.6",
19-
"com.unity.ide.visualstudio": "2.0.8",
20-
"com.unity.ide.vscode": "1.2.3",
21-
"com.unity.purchasing": "3.1.0",
22-
"com.unity.test-framework": "1.1.24",
23-
"com.unity.textmeshpro": "3.0.6",
24-
"com.unity.timeline": "1.5.5",
25-
"com.unity.ugui": "1.0.0",
15+
"com.unity.ads": "4.4.2",
16+
"com.unity.ai.navigation": "2.0.4",
17+
"com.unity.analytics": "3.8.1",
18+
"com.unity.collab-proxy": "2.3.1",
19+
"com.unity.ide.rider": "3.0.34",
20+
"com.unity.ide.visualstudio": "2.0.22",
21+
"com.unity.purchasing": "4.11.0",
22+
"com.unity.test-framework": "1.3.9",
23+
"com.unity.timeline": "1.8.7",
24+
"com.unity.ugui": "2.0.0",
25+
"com.unity.modules.accessibility": "1.0.0",
2626
"com.unity.modules.ai": "1.0.0",
2727
"com.unity.modules.androidjni": "1.0.0",
2828
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 66 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,55 @@
1717
"version": "1.0.0",
1818
"depth": 0,
1919
"source": "builtin",
20-
"dependencies": {}
20+
"dependencies": {
21+
"com.unity.modules.tilemap": "1.0.0",
22+
"com.unity.modules.uielements": "1.0.0"
23+
}
2124
},
2225
"com.unity.ads": {
23-
"version": "3.7.1",
26+
"version": "4.4.2",
2427
"depth": 0,
2528
"source": "registry",
2629
"dependencies": {
2730
"com.unity.ugui": "1.0.0"
2831
},
2932
"url": "https://packages.unity.com"
3033
},
31-
"com.unity.analytics": {
32-
"version": "3.5.3",
34+
"com.unity.ai.navigation": {
35+
"version": "2.0.4",
3336
"depth": 0,
3437
"source": "registry",
3538
"dependencies": {
36-
"com.unity.ugui": "1.0.0"
39+
"com.unity.modules.ai": "1.0.0"
3740
},
3841
"url": "https://packages.unity.com"
3942
},
40-
"com.unity.collab-proxy": {
41-
"version": "1.5.7",
43+
"com.unity.analytics": {
44+
"version": "3.8.1",
4245
"depth": 0,
4346
"source": "registry",
4447
"dependencies": {
45-
"com.unity.nuget.newtonsoft-json": "2.0.0"
48+
"com.unity.ugui": "1.0.0",
49+
"com.unity.services.analytics": "1.0.4"
4650
},
4751
"url": "https://packages.unity.com"
4852
},
53+
"com.unity.collab-proxy": {
54+
"version": "2.3.1",
55+
"depth": 0,
56+
"source": "registry",
57+
"dependencies": {},
58+
"url": "https://packages.unity.com"
59+
},
4960
"com.unity.ext.nunit": {
50-
"version": "1.0.6",
61+
"version": "2.0.5",
5162
"depth": 1,
5263
"source": "registry",
5364
"dependencies": {},
5465
"url": "https://packages.unity.com"
5566
},
5667
"com.unity.ide.rider": {
57-
"version": "3.0.6",
68+
"version": "3.0.34",
5869
"depth": 0,
5970
"source": "registry",
6071
"dependencies": {
@@ -63,82 +74,94 @@
6374
"url": "https://packages.unity.com"
6475
},
6576
"com.unity.ide.visualstudio": {
66-
"version": "2.0.8",
77+
"version": "2.0.22",
6778
"depth": 0,
6879
"source": "registry",
6980
"dependencies": {
7081
"com.unity.test-framework": "1.1.9"
7182
},
7283
"url": "https://packages.unity.com"
7384
},
74-
"com.unity.ide.vscode": {
75-
"version": "1.2.3",
76-
"depth": 0,
77-
"source": "registry",
78-
"dependencies": {},
79-
"url": "https://packages.unity.com"
80-
},
8185
"com.unity.nuget.newtonsoft-json": {
82-
"version": "3.0.2",
83-
"depth": 1,
86+
"version": "3.2.1",
87+
"depth": 2,
8488
"source": "registry",
8589
"dependencies": {},
8690
"url": "https://packages.unity.com"
8791
},
8892
"com.unity.purchasing": {
89-
"version": "3.1.0",
93+
"version": "4.11.0",
9094
"depth": 0,
9195
"source": "registry",
9296
"dependencies": {
9397
"com.unity.ugui": "1.0.0",
94-
"com.unity.modules.unityanalytics": "1.0.0",
95-
"com.unity.modules.unitywebrequest": "1.0.0",
98+
"com.unity.services.core": "1.8.2",
99+
"com.unity.modules.androidjni": "1.0.0",
96100
"com.unity.modules.jsonserialize": "1.0.0",
97-
"com.unity.modules.androidjni": "1.0.0"
101+
"com.unity.modules.unitywebrequest": "1.0.0"
98102
},
99103
"url": "https://packages.unity.com"
100104
},
101-
"com.unity.test-framework": {
102-
"version": "1.1.24",
103-
"depth": 0,
105+
"com.unity.services.analytics": {
106+
"version": "4.4.0",
107+
"depth": 1,
104108
"source": "registry",
105109
"dependencies": {
106-
"com.unity.ext.nunit": "1.0.6",
107-
"com.unity.modules.imgui": "1.0.0",
108-
"com.unity.modules.jsonserialize": "1.0.0"
110+
"com.unity.ugui": "1.0.0",
111+
"com.unity.services.core": "1.8.1",
112+
"com.unity.nuget.newtonsoft-json": "3.0.2"
109113
},
110114
"url": "https://packages.unity.com"
111115
},
112-
"com.unity.textmeshpro": {
113-
"version": "3.0.6",
116+
"com.unity.services.core": {
117+
"version": "1.12.4",
118+
"depth": 1,
119+
"source": "registry",
120+
"dependencies": {
121+
"com.unity.modules.androidjni": "1.0.0",
122+
"com.unity.nuget.newtonsoft-json": "3.2.1",
123+
"com.unity.modules.unitywebrequest": "1.0.0"
124+
},
125+
"url": "https://packages.unity.com"
126+
},
127+
"com.unity.test-framework": {
128+
"version": "1.3.9",
114129
"depth": 0,
115130
"source": "registry",
116131
"dependencies": {
117-
"com.unity.ugui": "1.0.0"
132+
"com.unity.ext.nunit": "2.0.3",
133+
"com.unity.modules.imgui": "1.0.0",
134+
"com.unity.modules.jsonserialize": "1.0.0"
118135
},
119136
"url": "https://packages.unity.com"
120137
},
121138
"com.unity.timeline": {
122-
"version": "1.5.5",
139+
"version": "1.8.7",
123140
"depth": 0,
124141
"source": "registry",
125142
"dependencies": {
143+
"com.unity.modules.audio": "1.0.0",
126144
"com.unity.modules.director": "1.0.0",
127145
"com.unity.modules.animation": "1.0.0",
128-
"com.unity.modules.audio": "1.0.0",
129146
"com.unity.modules.particlesystem": "1.0.0"
130147
},
131148
"url": "https://packages.unity.com"
132149
},
133150
"com.unity.ugui": {
134-
"version": "1.0.0",
151+
"version": "2.0.0",
135152
"depth": 0,
136153
"source": "builtin",
137154
"dependencies": {
138155
"com.unity.modules.ui": "1.0.0",
139156
"com.unity.modules.imgui": "1.0.0"
140157
}
141158
},
159+
"com.unity.modules.accessibility": {
160+
"version": "1.0.0",
161+
"depth": 0,
162+
"source": "builtin",
163+
"dependencies": {}
164+
},
142165
"com.unity.modules.ai": {
143166
"version": "1.0.0",
144167
"depth": 0,
@@ -186,6 +209,12 @@
186209
"com.unity.modules.animation": "1.0.0"
187210
}
188211
},
212+
"com.unity.modules.hierarchycore": {
213+
"version": "1.0.0",
214+
"depth": 1,
215+
"source": "builtin",
216+
"dependencies": {}
217+
},
189218
"com.unity.modules.imageconversion": {
190219
"version": "1.0.0",
191220
"depth": 0,
@@ -275,17 +304,7 @@
275304
"com.unity.modules.ui": "1.0.0",
276305
"com.unity.modules.imgui": "1.0.0",
277306
"com.unity.modules.jsonserialize": "1.0.0",
278-
"com.unity.modules.uielementsnative": "1.0.0"
279-
}
280-
},
281-
"com.unity.modules.uielementsnative": {
282-
"version": "1.0.0",
283-
"depth": 1,
284-
"source": "builtin",
285-
"dependencies": {
286-
"com.unity.modules.ui": "1.0.0",
287-
"com.unity.modules.imgui": "1.0.0",
288-
"com.unity.modules.jsonserialize": "1.0.0"
307+
"com.unity.modules.hierarchycore": "1.0.0"
289308
}
290309
},
291310
"com.unity.modules.umbra": {

‎ProjectSettings/MultiplayerManager.asset‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!655991488 &1
4+
MultiplayerManager:
5+
m_ObjectHideFlags: 0
6+
m_EnableMultiplayerRoles: 0
7+
m_ActiveMultiplayerRole: 0

‎ProjectSettings/PackageManagerSettings.asset‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,33 @@ MonoBehaviour:
1313
m_Name:
1414
m_EditorClassIdentifier:
1515
m_EnablePreReleasePackages: 0
16-
m_EnablePackageDependencies: 0
1716
m_AdvancedSettingsExpanded: 1
1817
m_ScopedRegistriesSettingsExpanded: 1
1918
m_SeeAllPackageVersions: 0
19+
m_DismissPreviewPackagesInUse: 0
2020
oneTimeWarningShown: 0
21+
oneTimeDeprecatedPopUpShown: 0
2122
m_Registries:
2223
- m_Id: main
2324
m_Name:
2425
m_Url: https://packages.unity.com
2526
m_Scopes: []
2627
m_IsDefault: 1
2728
m_Capabilities: 7
28-
- m_Id: scoped:NPM
29+
m_ConfigSource: 0
30+
- m_Id: scoped:project:NPM
2931
m_Name: NPM
3032
m_Url: https://registry.npmjs.org
3133
m_Scopes:
3234
- clever-crow
3335
m_IsDefault: 0
3436
m_Capabilities: 0
35-
m_UserSelectedRegistryName:
37+
m_ConfigSource: 4
38+
m_UserSelectedRegistryName: NPM
3639
m_UserAddingNewScopedRegistry: 0
3740
m_RegistryInfoDraft:
38-
m_ErrorMessage:
39-
m_Original:
40-
m_Id: scoped:NPM
41-
m_Name: NPM
42-
m_Url: https://registry.npmjs.org
43-
m_Scopes:
44-
- clever-crow
45-
m_IsDefault: 0
46-
m_Capabilities: 0
4741
m_Modified: 0
48-
m_Name: NPM
49-
m_Url: https://registry.npmjs.org
50-
m_Scopes:
51-
- clever-crow
52-
m_SelectedScopeIndex: 0
42+
m_ErrorMessage:
43+
m_UserModificationsInstanceId: -850
44+
m_OriginalInstanceId: -854
5345
m_LoadAssets: 0

‎ProjectSettings/boot.config‎ renamed to ‎ProjectSettings/Packages/com.unity.services.core/Settings.json‎

File renamed without changes.

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.1.9f1
2-
m_EditorVersionWithRevision: 2021.1.9f1 (7a790e367ab3)
1+
m_EditorVersion: 2023.2.19f1
2+
m_EditorVersionWithRevision: 2023.2.19f1 (95c298372b1e)

‎UserSettings/EditorUserSettings.asset‎

-3.3 KB
Binary file not shown.

‎package-lock.json‎

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

0 commit comments

Comments
 (0)