Skip to content

Commit 9d8dc6a

Browse files
ashblueashblue
authored
Merge pull request #96 from ashblue/feature/version-upgrade
Feature/version upgrade
2 parents 7c9b09b + d530578 commit 9d8dc6a

17 files changed

+7258
-11363
lines changed

‎.github/workflows/commitlint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
commitlint:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v2
8+
- uses: actions/checkout@v3
99
with:
1010
fetch-depth: 0
11-
- uses: wagoid/commitlint-github-action@v3
11+
- uses: wagoid/commitlint-github-action@v5

‎.github/workflows/nightly-build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Nightly Build
2+
permissions:
3+
contents: write
24
on:
35
push:
46
branches:
@@ -7,11 +9,11 @@ jobs:
79
deployNightly:
810
runs-on: ubuntu-latest
911
steps:
10-
- uses: actions/checkout@v2
11-
- uses: actions/setup-node@v2
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-node@v3
1214
with:
13-
node-version: '14'
14-
- run: npm install
15+
node-version: 16
16+
- run: HUSKY=0 npm ci
1517
- run: npm run build
1618
- name: Deploy nightly branch
1719
run: sh ./publish-nightly.sh

‎.github/workflows/workflow.yml

+29-13
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,40 @@
1-
name: CI
1+
name: Release
2+
23
on:
34
push:
45
branches:
6+
- main
57
- master
6-
pull_request:
7-
branches:
8-
- develop
9-
- master
8+
9+
permissions:
10+
contents: read
11+
1012
jobs:
11-
test:
13+
release:
14+
name: Release
1215
runs-on: ubuntu-latest
16+
permissions:
17+
contents: write
18+
issues: write
19+
pull-requests: write
20+
id-token: write
1321
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions/setup-node@v3
22+
- name: Checkout
23+
uses: actions/checkout@v3
24+
with:
25+
fetch-depth: 0
26+
persist-credentials: false
27+
- name: Setup Node.js
28+
uses: actions/setup-node@v3
1629
with:
17-
node-version: '14'
18-
- run: npm install
19-
- run: npm run build
30+
node-version: 16
31+
- name: Install dependencies
32+
run: HUSKY=0 npm ci && npm run build
33+
- name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
34+
run: npm audit signatures
2035
- name: Release
2136
env:
37+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2239
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
23-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24-
run: npm run semantic-release
40+
run: npm run semantic-release

‎.gitignore

+41-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
1-
[Ll]ibrary/
2-
[Tt]emp/
3-
[Oo]bj/
4-
[Bb]uild/
5-
[Bb]uilds/
6-
Assets/AssetStoreTools*
1+
/[Ll]ibrary/
2+
/[Tt]emp/
3+
/[Oo]bj/
4+
/[Bb]uild/
5+
/[Bb]uilds/
6+
/[Ll]ogs/
7+
/[Uu]ser[Ss]ettings/
8+
CodeCoverage/
9+
UIElementsSchema/
10+
11+
# MemoryCaptures can get excessive in size.
12+
# They also could contain extremely sensitive data
13+
/[Mm]emoryCaptures/
14+
15+
# Recordings can get excessive in size
16+
/[Rr]ecordings/
17+
18+
/[Aa]ssets/AssetStoreTools*
19+
20+
# Autogenerated Jetbrains Rider plugin
21+
/[Aa]ssets/Plugins/Editor/JetBrains*
722

823
# Visual Studio cache directory
9-
/.vs/
24+
.vs/
25+
26+
# Gradle cache directory
27+
.gradle/
1028

1129
# Autogenerated VS/MD/Consulo solution and project files
1230
ExportedObj/
@@ -22,23 +40,35 @@ ExportedObj/
2240
*.booproj
2341
*.svd
2442
*.pdb
43+
*.mdb
44+
*.opendb
45+
*.VC.db
2546

2647
# Unity3D generated meta files
2748
*.pidb.meta
2849
*.pdb.meta
50+
*.mdb.meta
2951

3052
# Unity3D Generated File On Crash Reports
3153
sysinfo.txt
3254

3355
# Builds
3456
*.apk
57+
*.aab
3558
*.unitypackage
36-
/Logs/Packages-Update.log
37-
Logs/
38-
CodeCoverage/
59+
*.app
60+
61+
# Crashlytics generated file
62+
crashlytics-build.properties
63+
64+
# Packed Addressables
65+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
66+
67+
# Temporary auto-generated Android Assets
68+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
69+
/[Aa]ssets/[Ss]treamingAssets/aa/*
3970

4071
# Node.js
4172
node_modules
4273
dist
4374
dist.zip
44-
UserSettings/

‎.husky/commit-msg

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
33

4-
npx --no-install commitlint --edit
4+
npx --no -- commitlint --edit ${1}

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.0
1+
16.17.0

‎.oyster.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"behavior tree",
77
"builder pattern"
88
],
9-
"oysterVersion": "2.1.0",
9+
"oysterVersion": "3.0.2",
1010
"packageName": "com.fluid.behavior-tree",
1111
"packageScope": "com.fluid",
1212
"unityVersion": "2018.1",

‎Assets/Samples/DecoratorRepeatWithWait.cs

+6-12
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

+11-11
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",

0 commit comments

Comments
 (0)