Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c982169904 | ||
|
|
e0bccd72ea | ||
|
|
f422c7ad70 | ||
|
|
bec454bb7f | ||
|
|
f53444d03a | ||
|
|
ce1619bc0b | ||
|
|
2d05948c22 | ||
|
|
c70d1bbc47 | ||
|
|
4883822737 | ||
|
|
7f540a0d26 | ||
|
|
ec8c4a8ee3 | ||
|
|
1156d41628 | ||
|
|
1399bee518 | ||
|
|
a465239264 | ||
|
|
25b37a5239 | ||
|
|
364c9fde40 | ||
|
|
2a2698db2f | ||
|
|
b4a78058f2 | ||
|
|
4ca9b26c57 |
+23
-16
@@ -10,7 +10,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-latest
|
runs-on: windows-2019
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@@ -22,26 +22,33 @@ jobs:
|
|||||||
key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
|
key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
Library-
|
Library-
|
||||||
|
|
||||||
- name: Setup Unity
|
- name: Cache Docker image
|
||||||
uses: kuler90/setup-unity@v1.0.8
|
uses: ScribeMD/docker-cache@0.3.4
|
||||||
with:
|
with:
|
||||||
unity-modules: windows-il2cpp
|
key: docker-${{ runner.os }}-${{ hashFiles('ProjectSettings/ProjectVersion.txt') }}
|
||||||
|
|
||||||
- name: Activate Unity
|
- uses: game-ci/unity-builder@v2
|
||||||
uses: kuler90/activate-unity@v1.1.2
|
name: Build project
|
||||||
|
env:
|
||||||
|
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||||
|
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
|
||||||
|
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
|
||||||
with:
|
with:
|
||||||
unity-username: ${{ secrets.UNITY_USERNAME }}
|
targetPlatform: StandaloneWindows64
|
||||||
unity-password: ${{ secrets.UNITY_PASSWORD }}
|
buildName: WACVR
|
||||||
unity-authenticator-key: ${{ secrets.UNITY_AUTHENTICATOR_KEY }}
|
|
||||||
|
|
||||||
- name: Build WACVR
|
- name: Clean debug folder
|
||||||
uses: kuler90/build-unity@v1.0.4
|
uses: JesseTG/rm@v1.0.3
|
||||||
with:
|
with:
|
||||||
build-target: StandaloneWindows64
|
path: build\StandaloneWindows64\WACVR_BurstDebugInformation_DoNotShip
|
||||||
build-path: ./build/WACVR.exe
|
|
||||||
|
- name: Clean backup folder
|
||||||
|
uses: JesseTG/rm@v1.0.3
|
||||||
|
with:
|
||||||
|
path: build\StandaloneWindows64\WACVR_BackUpThisFolder_ButDontShipItWithYourGame
|
||||||
|
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v3.0.0
|
uses: actions/upload-artifact@v3.0.0
|
||||||
with:
|
with:
|
||||||
path: ./build/
|
path: build\StandaloneWindows64
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -20,6 +20,28 @@ MonoBehaviour:
|
|||||||
company: Unity
|
company: Unity
|
||||||
priority: 0
|
priority: 0
|
||||||
required: 0
|
required: 0
|
||||||
|
--- !u!114 &-7791884441479556929
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c465bd23c9c4fb442ae89117552a5f3f, type: 3}
|
||||||
|
m_Name: HandTrackingFeature Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Ultraleap Hand Tracking
|
||||||
|
version: 1.0.0
|
||||||
|
featureIdInternal: com.ultraleap.tracking.openxr.feature.handtracking
|
||||||
|
openxrExtensionStrings: XR_EXT_hand_tracking XR_ULTRALEAP_hand_tracking_forearm
|
||||||
|
company: Ultraleap
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
metaPermissions: 1
|
||||||
|
metaHighFrequency: 1
|
||||||
--- !u!114 &-6348321304186183749
|
--- !u!114 &-6348321304186183749
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -38,6 +60,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 5471978460094067691}
|
- {fileID: 5471978460094067691}
|
||||||
- {fileID: -660904743828199304}
|
- {fileID: -660904743828199304}
|
||||||
- {fileID: 587458779450762736}
|
- {fileID: 587458779450762736}
|
||||||
|
- {fileID: 2249684173708023368}
|
||||||
- {fileID: 2332717924642193878}
|
- {fileID: 2332717924642193878}
|
||||||
- {fileID: -4197090093912000502}
|
- {fileID: -4197090093912000502}
|
||||||
- {fileID: 6760998554925213443}
|
- {fileID: 6760998554925213443}
|
||||||
@@ -46,6 +69,54 @@ MonoBehaviour:
|
|||||||
- {fileID: -9221150314526244616}
|
- {fileID: -9221150314526244616}
|
||||||
m_renderMode: 1
|
m_renderMode: 1
|
||||||
m_depthSubmissionMode: 0
|
m_depthSubmissionMode: 0
|
||||||
|
--- !u!114 &-5716994982038825123
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3}
|
||||||
|
m_Name: RuntimeDebuggerOpenXRFeature Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Runtime Debugger
|
||||||
|
version: 1
|
||||||
|
featureIdInternal: com.unity.openxr.features.runtimedebugger
|
||||||
|
openxrExtensionStrings:
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
cacheSize: 1048576
|
||||||
|
perThreadCacheSize: 51200
|
||||||
|
--- !u!114 &-4888909012217420041
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
|
||||||
|
m_Name: Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
features:
|
||||||
|
- {fileID: -2759355098841077344}
|
||||||
|
- {fileID: 1242339343659939596}
|
||||||
|
- {fileID: -7791884441479556929}
|
||||||
|
- {fileID: 529299522121976043}
|
||||||
|
- {fileID: -2114470977307191787}
|
||||||
|
- {fileID: -2665317602316070962}
|
||||||
|
- {fileID: 1505799936249668369}
|
||||||
|
- {fileID: -1778638552271781925}
|
||||||
|
- {fileID: 7291351694695269871}
|
||||||
|
- {fileID: 7167600451737671974}
|
||||||
|
- {fileID: -5716994982038825123}
|
||||||
|
m_renderMode: 1
|
||||||
|
m_depthSubmissionMode: 0
|
||||||
--- !u!114 &-4197090093912000502
|
--- !u!114 &-4197090093912000502
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -108,6 +179,97 @@ MonoBehaviour:
|
|||||||
required: 0
|
required: 0
|
||||||
metaPermissions: 1
|
metaPermissions: 1
|
||||||
metaHighFrequency: 1
|
metaHighFrequency: 1
|
||||||
|
--- !u!114 &-2759355098841077344
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3}
|
||||||
|
m_Name: ConformanceAutomationFeature Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Conformance Automation
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.conformance
|
||||||
|
openxrExtensionStrings: XR_EXT_conformance_automation
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
--- !u!114 &-2665317602316070962
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3}
|
||||||
|
m_Name: MetaQuestTouchProControllerProfile Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Meta Quest Touch Pro Controller Profile
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.input.metaquestpro
|
||||||
|
openxrExtensionStrings: XR_FB_touch_controller_pro
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
--- !u!114 &-2114470977307191787
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f647cc0545697264a9878224faada6d5, type: 3}
|
||||||
|
m_Name: MetaQuestFeature Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Meta Quest Support
|
||||||
|
version: 1.0.0
|
||||||
|
featureIdInternal: com.unity.openxr.feature.metaquest
|
||||||
|
openxrExtensionStrings: XR_OCULUS_android_initialize_loader
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
targetDevices:
|
||||||
|
- visibleName: Quest
|
||||||
|
manifestName: quest
|
||||||
|
enabled: 1
|
||||||
|
- visibleName: Quest 2
|
||||||
|
manifestName: quest2
|
||||||
|
enabled: 1
|
||||||
|
- visibleName: Quest Pro
|
||||||
|
manifestName: cambria
|
||||||
|
enabled: 1
|
||||||
|
--- !u!114 &-1778638552271781925
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3}
|
||||||
|
m_Name: MockRuntime Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Mock Runtime
|
||||||
|
version: 0.0.2
|
||||||
|
featureIdInternal: com.unity.openxr.feature.mockruntime
|
||||||
|
openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
ignoreValidationErrors: 0
|
||||||
--- !u!114 &-660904743828199304
|
--- !u!114 &-660904743828199304
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -140,9 +302,30 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
|
m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
|
||||||
m_Name: OpenXR Package Settings
|
m_Name: OpenXR Package Settings
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
Keys: 01000000
|
Keys: 0100000007000000
|
||||||
Values:
|
Values:
|
||||||
- {fileID: -6348321304186183749}
|
- {fileID: -6348321304186183749}
|
||||||
|
- {fileID: -4888909012217420041}
|
||||||
|
--- !u!114 &529299522121976043
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3}
|
||||||
|
m_Name: KHRSimpleControllerProfile Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Khronos Simple Controller Profile
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile
|
||||||
|
openxrExtensionStrings:
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
--- !u!114 &587458779450762736
|
--- !u!114 &587458779450762736
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -163,6 +346,66 @@ MonoBehaviour:
|
|||||||
company: Unity
|
company: Unity
|
||||||
priority: 0
|
priority: 0
|
||||||
required: 0
|
required: 0
|
||||||
|
--- !u!114 &1242339343659939596
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3}
|
||||||
|
m_Name: EyeGazeInteraction Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Eye Gaze Interaction Profile
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.input.eyetracking
|
||||||
|
openxrExtensionStrings: XR_EXT_eye_gaze_interaction
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
--- !u!114 &1505799936249668369
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3}
|
||||||
|
m_Name: MicrosoftHandInteraction Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Microsoft Hand Interaction Profile
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.input.handtracking
|
||||||
|
openxrExtensionStrings: XR_MSFT_hand_interaction
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
--- !u!114 &2249684173708023368
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3}
|
||||||
|
m_Name: MetaQuestTouchProControllerProfile Standalone
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Meta Quest Touch Pro Controller Profile
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.input.metaquestpro
|
||||||
|
openxrExtensionStrings: XR_FB_touch_controller_pro
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
--- !u!114 &2332717924642193878
|
--- !u!114 &2332717924642193878
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -312,6 +555,48 @@ MonoBehaviour:
|
|||||||
required: 0
|
required: 0
|
||||||
metaPermissions: 1
|
metaPermissions: 1
|
||||||
metaHighFrequency: 1
|
metaHighFrequency: 1
|
||||||
|
--- !u!114 &7167600451737671974
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3}
|
||||||
|
m_Name: OculusTouchControllerProfile Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Oculus Touch Controller Profile
|
||||||
|
version: 0.0.1
|
||||||
|
featureIdInternal: com.unity.openxr.feature.input.oculustouch
|
||||||
|
openxrExtensionStrings:
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
--- !u!114 &7291351694695269871
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 9ef793c31862a37448e907829482ef80, type: 3}
|
||||||
|
m_Name: OculusQuestFeature Android
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_enabled: 0
|
||||||
|
nameUi: Oculus Quest Support
|
||||||
|
version: 1.0.0
|
||||||
|
featureIdInternal: com.unity.openxr.feature.oculusquest
|
||||||
|
openxrExtensionStrings: XR_OCULUS_android_initialize_loader
|
||||||
|
company: Unity
|
||||||
|
priority: 0
|
||||||
|
required: 0
|
||||||
|
targetQuest: 1
|
||||||
|
targetQuest2: 1
|
||||||
--- !u!114 &7581227243671795047
|
--- !u!114 &7581227243671795047
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3487ad0d6389f9d4098e0379af2a7bdc
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,435 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &6454538435848927911
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6454538435848927908}
|
||||||
|
- component: {fileID: 6454538435848927909}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Trigger
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6454538435848927908
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538435848927911}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 6454538437449875549}
|
||||||
|
m_RootOrder: 3
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!135 &6454538435848927909
|
||||||
|
SphereCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538435848927911}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Radius: 0.5
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &6454538436114447007
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6454538436114447004}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: FrontMarker
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6454538436114447004
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538436114447007}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: -0.5}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 4295453007505732795}
|
||||||
|
m_Father: {fileID: 6454538437449875549}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &6454538436512006510
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6454538436512006511}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Center
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6454538436512006511
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538436512006510}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 5314117124353818492}
|
||||||
|
m_Father: {fileID: 6454538437449875549}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &6454538437449875548
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6454538437449875549}
|
||||||
|
- component: {fileID: 6454538437449875546}
|
||||||
|
- component: {fileID: 6454538437449875547}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: RadialTouchSystem
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6454538437449875549
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538437449875548}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 6454538436114447004}
|
||||||
|
- {fileID: 6454538437505571571}
|
||||||
|
- {fileID: 6454538436512006511}
|
||||||
|
- {fileID: 6454538435848927908}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!65 &6454538437449875546
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538437449875548}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Size: {x: 1, y: 1, z: 1}
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &6454538437449875547
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538437449875548}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c1179a93b7ed6e3489dfc4ff44f9e7ed, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
Hand: {fileID: 0}
|
||||||
|
TriggerTransform: {fileID: 6454538435848927908}
|
||||||
|
FrontCircle: {fileID: 6454538436114447004}
|
||||||
|
BackCircle: {fileID: 6454538437505571571}
|
||||||
|
Center: {fileID: 6454538436512006511}
|
||||||
|
--- !u!1 &6454538437505571570
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6454538437505571571}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: BackMarker
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6454538437505571571
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6454538437505571570}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0.5}
|
||||||
|
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 5314117126094408932}
|
||||||
|
m_Father: {fileID: 6454538437449875549}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1001 &3148062441657291909
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 6454538436114447004}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: -90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4819219486183475463, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: VisualCircle
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: e3e84c8e92061f540bb6b5de45f6a253, type: 3}
|
||||||
|
--- !u!4 &4295453007505732795 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 3148062441657291909}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1001 &6454538436011728706
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 6454538436512006511}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: -90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4819219486183475463, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: VisualCircle
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: e3e84c8e92061f540bb6b5de45f6a253, type: 3}
|
||||||
|
--- !u!4 &5314117124353818492 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6454538436011728706}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1001 &6454538437492288730
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 6454538437505571571}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0.7071068
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: -90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4819219486183475463, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: VisualCircle
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: e3e84c8e92061f540bb6b5de45f6a253, type: 3}
|
||||||
|
--- !u!4 &5314117126094408932 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1165493166082121790, guid: e3e84c8e92061f540bb6b5de45f6a253,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6454538437492288730}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3815330c4b5f3ed4cb791195ffa02d47
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &4819219486183475463
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1165493166082121790}
|
||||||
|
- component: {fileID: 4622111974141767723}
|
||||||
|
- component: {fileID: 1142653059288628402}
|
||||||
|
- component: {fileID: 3239989892916474361}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: VisualCircle
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1165493166082121790
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4819219486183475463}
|
||||||
|
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0.287}
|
||||||
|
m_LocalScale: {x: 1, y: 0, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||||
|
--- !u!33 &4622111974141767723
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4819219486183475463}
|
||||||
|
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!23 &1142653059288628402
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4819219486183475463}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 2
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 3
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
|
--- !u!64 &3239989892916474361
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4819219486183475463}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Convex: 1
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e3e84c8e92061f540bb6b5de45f6a253
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+8732
-245
File diff suppressed because it is too large
Load Diff
@@ -24,11 +24,11 @@ public class ConfigManager : MonoBehaviour
|
|||||||
{
|
{
|
||||||
onConfigChanged += EnsureInitialization;
|
onConfigChanged += EnsureInitialization;
|
||||||
onConfigChanged += SaveFileWait;
|
onConfigChanged += SaveFileWait;
|
||||||
|
EnsureInitialization();
|
||||||
}
|
}
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
EnsureInitialization();
|
|
||||||
AddListenerToWidget(ConfigPanelComponents);
|
AddListenerToWidget(ConfigPanelComponents);
|
||||||
onConfigChanged?.Invoke();
|
onConfigChanged?.Invoke();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ public class TouchSettingManager : MonoBehaviour
|
|||||||
|
|
||||||
sampleDropdown.onValueChanged.AddListener((int value) => {
|
sampleDropdown.onValueChanged.AddListener((int value) => {
|
||||||
string fpsString = Enum.GetName(typeof(CEnum.FPS), value);
|
string fpsString = Enum.GetName(typeof(CEnum.FPS), value);
|
||||||
Time.fixedDeltaTime = 1 / int.Parse(fpsString.Remove(0, 3));
|
Time.fixedDeltaTime = 1f / Convert.ToInt32(fpsString.Remove(0, 3));
|
||||||
|
Debug.Log("Time:" + fpsString);
|
||||||
});
|
});
|
||||||
|
|
||||||
sampleDropdown.onValueChanged?.Invoke(sampleDropdown.value);
|
sampleDropdown.onValueChanged?.Invoke(sampleDropdown.value);
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using System.IO.Ports;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Collections;
|
||||||
|
|
||||||
|
public class DistanceToTouch : MonoBehaviour
|
||||||
|
{
|
||||||
|
public LightManager LightManager;
|
||||||
|
public Transform[] Hands;
|
||||||
|
private int _insideColliderCount = 0;
|
||||||
|
private int Area;
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
Area = Convert.ToInt32(gameObject.name);
|
||||||
|
}
|
||||||
|
private void Enter()
|
||||||
|
{
|
||||||
|
_insideColliderCount += 1;
|
||||||
|
TouchManager.SetTouch(Area, true);
|
||||||
|
LightManager.UpdateFadeLight(Area, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Exit()
|
||||||
|
{
|
||||||
|
_insideColliderCount -= 1;
|
||||||
|
_insideColliderCount = Mathf.Max(0, _insideColliderCount);
|
||||||
|
if (_insideColliderCount == 0)
|
||||||
|
{
|
||||||
|
TouchManager.SetTouch(Area, false);
|
||||||
|
LightManager.UpdateFadeLight(Area, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
foreach (var hand in Hands)
|
||||||
|
{
|
||||||
|
var distance = Vector3.Distance(hand.position, transform.position);
|
||||||
|
if (distance < 0.1f)
|
||||||
|
{
|
||||||
|
//Enter();
|
||||||
|
//Debug.Log("Enter");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e918af4dcb18e234c9a8fd3e5d0b5b82
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 163253812e6dfa848b9ba6343296bd21
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class RadialTouchManager : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Transform Hand;
|
||||||
|
[SerializeField] private Transform TriggerTransform;
|
||||||
|
[SerializeField] private Transform FrontCircle;
|
||||||
|
[SerializeField] private Transform BackCircle;
|
||||||
|
[SerializeField] private Transform Center;
|
||||||
|
private float FBScaleDiff = 0f;
|
||||||
|
private float TriggerDistance = 1f;
|
||||||
|
private float MaxDistance = 2f;
|
||||||
|
private float ZPosition = 0f;
|
||||||
|
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
FBScaleDiff = FrontCircle.localScale.x - BackCircle.localScale.x;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
TriggerTransform.position = Hand.position;
|
||||||
|
SetCenterPosition();
|
||||||
|
SetMaxDistance();
|
||||||
|
|
||||||
|
}
|
||||||
|
private void SetCenterPosition()
|
||||||
|
{
|
||||||
|
ZPosition = Mathf.Clamp(TriggerTransform.localPosition.z, -0.5f, 0.5f);
|
||||||
|
Center.localPosition = new Vector3(
|
||||||
|
Center.localPosition.x,
|
||||||
|
Center.localPosition.x,
|
||||||
|
ZPosition
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetMaxDistance()
|
||||||
|
{
|
||||||
|
TriggerDistance = 1 - FBScaleDiff * (ZPosition + 0.5f);
|
||||||
|
Center.localScale = new Vector3(
|
||||||
|
TriggerDistance,
|
||||||
|
TriggerDistance,
|
||||||
|
TriggerDistance
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool IsInRange(Vector3 position)
|
||||||
|
{
|
||||||
|
if (position.z < BackCircle.localPosition.z && position.z > FrontCircle.localPosition.z)
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c1179a93b7ed6e3489dfc4ff44f9e7ed
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -93,8 +93,8 @@ public class SerialManager : MonoBehaviour
|
|||||||
if (ComR.IsOpen)
|
if (ComR.IsOpen)
|
||||||
ReadHead(ComR, 1);
|
ReadHead(ComR, 1);
|
||||||
//following are touch test code
|
//following are touch test code
|
||||||
//if (Input.GetKeyDown(KeyCode.M))
|
if (Input.GetKeyDown(KeyCode.M))
|
||||||
//StartCoroutine(TouchTest(true));
|
StartCoroutine(TouchTest(true));
|
||||||
//if (Input.GetKeyDown(KeyCode.M) && StartUp)
|
//if (Input.GetKeyDown(KeyCode.M) && StartUp)
|
||||||
//SendTouchState();
|
//SendTouchState();
|
||||||
}
|
}
|
||||||
@@ -117,9 +117,12 @@ public class SerialManager : MonoBehaviour
|
|||||||
{
|
{
|
||||||
SetTouch(i, true);
|
SetTouch(i, true);
|
||||||
Debug.Log(i);
|
Debug.Log(i);
|
||||||
yield return new WaitForSeconds(0.05f);
|
PingTouchThread();
|
||||||
|
yield return new WaitForSeconds(0.03f);
|
||||||
SetTouch(i, false);
|
SetTouch(i, false);
|
||||||
yield return new WaitForSeconds(0.05f);
|
PingTouchThread();
|
||||||
|
yield return new WaitForSeconds(0.03f);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,34 +148,34 @@ public class SerialManager : MonoBehaviour
|
|||||||
byte syncCheckSum = (byte)44;
|
byte syncCheckSum = (byte)44;
|
||||||
syncbytes.Add(syncCheckSum);
|
syncbytes.Add(syncCheckSum);
|
||||||
Serial.Write(syncbytes.ToArray(), 0, syncbytes.Count);
|
Serial.Write(syncbytes.ToArray(), 0, syncbytes.Count);
|
||||||
//Debug.Log($"GET SYNC BOARD VER {side}");
|
Debug.Log($"GET SYNC BOARD VER {side}");
|
||||||
break;
|
break;
|
||||||
case CMD_NEXT_READ:
|
case CMD_NEXT_READ:
|
||||||
//Response: corresponding read bytes + checksum
|
//Response: corresponding read bytes + checksum
|
||||||
StartUp = false;
|
StartUp = false;
|
||||||
//Debug.Log($"Side {side} NEXT READ {Convert.ToByte(data[2])}");
|
Debug.Log($"Side {side} NEXT READ {Convert.ToByte(data[2])}");
|
||||||
switch (Convert.ToByte(data[2]))
|
switch (Convert.ToByte(data[2]))
|
||||||
{
|
{
|
||||||
case 0x30:
|
case 0x30:
|
||||||
var bytes = ByteHelper.ConvertStringToByteArray(read1);
|
var bytes = ByteHelper.ConvertStringToByteArray(read1);
|
||||||
bytes.Add(ByteHelper.CalCheckSum(bytes.ToArray(), bytes.Count));
|
bytes.Add(ByteHelper.CalCheckSum(bytes.ToArray(), bytes.Count));
|
||||||
//Debug.Log("Read 1");
|
Debug.Log("Read 1");
|
||||||
Serial.Write(bytes.ToArray(), 0, bytes.Count);
|
Serial.Write(bytes.ToArray(), 0, bytes.Count);
|
||||||
break;
|
break;
|
||||||
case 0x31:
|
case 0x31:
|
||||||
var bytes2 = ByteHelper.ConvertStringToByteArray(read2);
|
var bytes2 = ByteHelper.ConvertStringToByteArray(read2);
|
||||||
bytes2.Add(ByteHelper.CalCheckSum(bytes2.ToArray(), bytes2.Count));
|
bytes2.Add(ByteHelper.CalCheckSum(bytes2.ToArray(), bytes2.Count));
|
||||||
//Debug.Log("Read 2");
|
Debug.Log("Read 2");
|
||||||
Serial.Write(bytes2.ToArray(), 0, bytes2.Count);
|
Serial.Write(bytes2.ToArray(), 0, bytes2.Count);
|
||||||
break;
|
break;
|
||||||
case 0x33:
|
case 0x33:
|
||||||
var bytes3 = ByteHelper.ConvertStringToByteArray(read3);
|
var bytes3 = ByteHelper.ConvertStringToByteArray(read3);
|
||||||
bytes3.Add(ByteHelper.CalCheckSum(bytes3.ToArray(), bytes3.Count));
|
bytes3.Add(ByteHelper.CalCheckSum(bytes3.ToArray(), bytes3.Count));
|
||||||
//Debug.Log("Read 3");
|
Debug.Log("Read 3");
|
||||||
Serial.Write(bytes3.ToArray(), 0, bytes3.Count);
|
Serial.Write(bytes3.ToArray(), 0, bytes3.Count);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
//Debug.Log("Extra Read");
|
Debug.Log("Extra Read");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -189,34 +192,34 @@ public class SerialManager : MonoBehaviour
|
|||||||
unitBytes.AddRange(ByteHelper.ConvertStringToByteArray(UNIT_BOARD_VER));
|
unitBytes.AddRange(ByteHelper.ConvertStringToByteArray(UNIT_BOARD_VER));
|
||||||
unitBytes.Add(unitCheckSum);
|
unitBytes.Add(unitCheckSum);
|
||||||
Serial.Write(unitBytes.ToArray(), 0, unitBytes.Count);
|
Serial.Write(unitBytes.ToArray(), 0, unitBytes.Count);
|
||||||
//Debug.Log($"GET UNIT BOARD VER {side}");
|
Debug.Log($"GET UNIT BOARD VER {side}");
|
||||||
break;
|
break;
|
||||||
case CMD_MYSTERY1:
|
case CMD_MYSTERY1:
|
||||||
StartUp = false;
|
StartUp = false;
|
||||||
Serial.Write(SettingData_162, 0, 3);
|
Serial.Write(SettingData_162, 0, 3);
|
||||||
//Debug.Log($"MYSTERY 1 SIDE {side}");
|
Debug.Log($"MYSTERY 1 SIDE {side}");
|
||||||
break;
|
break;
|
||||||
case CMD_MYSTERY2:
|
case CMD_MYSTERY2:
|
||||||
StartUp = false;
|
StartUp = false;
|
||||||
Serial.Write(SettingData_148, 0, 3);
|
Serial.Write(SettingData_148, 0, 3);
|
||||||
//Debug.Log($"MYSTERY 2 SIDE {side}");
|
Debug.Log($"MYSTERY 2 SIDE {side}");
|
||||||
break;
|
break;
|
||||||
case CMD_START_AUTO_SCAN:
|
case CMD_START_AUTO_SCAN:
|
||||||
Serial.Write(SettingData_201.ToArray(), 0, 3);
|
Serial.Write(SettingData_201.ToArray(), 0, 3);
|
||||||
//Debug.Log($"START AUTO SCAN SIDE {side}");
|
Debug.Log($"START AUTO SCAN SIDE {side}");
|
||||||
StartUp = true;
|
StartUp = true;
|
||||||
if (!_touchThread.IsAlive)
|
if (!_touchThread.IsAlive)
|
||||||
_touchThread.Start();
|
_touchThread.Start();
|
||||||
break;
|
break;
|
||||||
case CMD_BEGIN_WRITE:
|
case CMD_BEGIN_WRITE:
|
||||||
// Debug.Log($"Begin Write For Side {side}");
|
Debug.Log($"Begin Write For Side {side}");
|
||||||
break;
|
break;
|
||||||
case CMD_NEXT_WRITE:
|
case CMD_NEXT_WRITE:
|
||||||
// Debug.Log($"Continue Write For Side {side}");
|
Debug.Log($"Continue Write For Side {side}");
|
||||||
break;
|
break;
|
||||||
case 154:
|
case 154:
|
||||||
StartUp = false;
|
StartUp = false;
|
||||||
//Debug.Log("BAD");
|
Debug.Log("BAD");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -241,13 +244,13 @@ public class SerialManager : MonoBehaviour
|
|||||||
Area -= 1; //0-239
|
Area -= 1; //0-239
|
||||||
if (Area < 120) //right side
|
if (Area < 120) //right side
|
||||||
{
|
{
|
||||||
Area += Area / 5 * 3 + 7;
|
Area += Area / 5 * 3 + 8;
|
||||||
ByteHelper.SetBit(TouchPackR, Area, State);
|
ByteHelper.SetBit(TouchPackR, Area, State);
|
||||||
}
|
}
|
||||||
else if (Area >= 120) //left side
|
else if (Area >= 120) //left side
|
||||||
{
|
{
|
||||||
Area -= 120;
|
Area -= 120;
|
||||||
Area += Area / 5 * 3 + 7;
|
Area += Area / 5 * 3 + 8;
|
||||||
ByteHelper.SetBit(TouchPackL, Area, State);
|
ByteHelper.SetBit(TouchPackL, Area, State);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,8 +16,9 @@ public class TouchManager : MonoBehaviour
|
|||||||
var toggle = widget.GetComponent<Toggle>();
|
var toggle = widget.GetComponent<Toggle>();
|
||||||
toggle.onValueChanged.AddListener((value) => {
|
toggle.onValueChanged.AddListener((value) => {
|
||||||
useIPCTouch = value;
|
useIPCTouch = value;
|
||||||
|
Debug.Log("UseIPCTouch: " + value);
|
||||||
});
|
});
|
||||||
toggle.onValueChanged.Invoke(useIPCTouch);
|
toggle.onValueChanged.Invoke(toggle.isOn);
|
||||||
}
|
}
|
||||||
|
|
||||||
IEnumerator TouchTest(bool State) //this is a touch test code
|
IEnumerator TouchTest(bool State) //this is a touch test code
|
||||||
@@ -33,6 +34,7 @@ public class TouchManager : MonoBehaviour
|
|||||||
}
|
}
|
||||||
public static void SetTouch(int Area, bool State) //set touch data 1-240
|
public static void SetTouch(int Area, bool State) //set touch data 1-240
|
||||||
{
|
{
|
||||||
|
Debug.Log("SetTouch: " + Area + " " + State + " " + useIPCTouch);
|
||||||
if (useIPCTouch)
|
if (useIPCTouch)
|
||||||
IPCManager.SetTouch(Area, State); //send touch data to IPC
|
IPCManager.SetTouch(Area, State); //send touch data to IPC
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.hecomi.uwindowcapture": "https://github.com/hecomi/uWindowCapture.git#upm",
|
"com.hecomi.uwindowcapture": "https://github.com/hecomi/uWindowCapture.git#upm",
|
||||||
"com.ultraleap.tracking": "6.6.0",
|
"com.ultraleap.tracking": "6.6.0",
|
||||||
"com.unity.ide.visualstudio": "2.0.16",
|
"com.unity.ide.visualstudio": "2.0.17",
|
||||||
"com.unity.ide.vscode": "1.2.5",
|
"com.unity.ide.vscode": "1.2.5",
|
||||||
"com.unity.nuget.newtonsoft-json": "3.0.2",
|
"com.unity.nuget.newtonsoft-json": "3.1.0",
|
||||||
"com.unity.render-pipelines.universal": "12.1.7",
|
"com.unity.render-pipelines.universal": "12.1.10",
|
||||||
"com.unity.test-framework": "2.0.1-pre.18",
|
"com.unity.test-framework": "2.0.1-pre.18",
|
||||||
"com.unity.textmeshpro": "3.0.6",
|
"com.unity.textmeshpro": "3.0.6",
|
||||||
"com.unity.ugui": "1.0.0",
|
"com.unity.ugui": "1.0.0",
|
||||||
"com.unity.xr.interaction.toolkit": "2.1.1",
|
"com.unity.xr.interaction.toolkit": "2.2.0",
|
||||||
"com.unity.xr.management": "4.2.1",
|
"com.unity.xr.management": "4.2.1",
|
||||||
"com.unity.xr.openxr": "1.5.3",
|
"com.unity.xr.openxr": "1.7.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
"com.unity.modules.animation": "1.0.0",
|
"com.unity.modules.animation": "1.0.0",
|
||||||
|
|||||||
+15
-15
@@ -15,7 +15,7 @@
|
|||||||
"url": "https://package.openupm.com"
|
"url": "https://package.openupm.com"
|
||||||
},
|
},
|
||||||
"com.unity.burst": {
|
"com.unity.burst": {
|
||||||
"version": "1.7.3",
|
"version": "1.8.2",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.ide.visualstudio": {
|
"com.unity.ide.visualstudio": {
|
||||||
"version": "2.0.16",
|
"version": "2.0.17",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.inputsystem": {
|
"com.unity.inputsystem": {
|
||||||
"version": "1.4.3",
|
"version": "1.5.0",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -63,14 +63,14 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.nuget.newtonsoft-json": {
|
"com.unity.nuget.newtonsoft-json": {
|
||||||
"version": "3.0.2",
|
"version": "3.1.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.render-pipelines.core": {
|
"com.unity.render-pipelines.core": {
|
||||||
"version": "12.1.7",
|
"version": "12.1.10",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -80,14 +80,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.render-pipelines.universal": {
|
"com.unity.render-pipelines.universal": {
|
||||||
"version": "12.1.7",
|
"version": "12.1.10",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.mathematics": "1.2.1",
|
"com.unity.mathematics": "1.2.1",
|
||||||
"com.unity.burst": "1.7.3",
|
"com.unity.burst": "1.8.2",
|
||||||
"com.unity.render-pipelines.core": "12.1.7",
|
"com.unity.render-pipelines.core": "12.1.10",
|
||||||
"com.unity.shadergraph": "12.1.7"
|
"com.unity.shadergraph": "12.1.10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.searcher": {
|
"com.unity.searcher": {
|
||||||
@@ -98,11 +98,11 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.shadergraph": {
|
"com.unity.shadergraph": {
|
||||||
"version": "12.1.7",
|
"version": "12.1.10",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.render-pipelines.core": "12.1.7",
|
"com.unity.render-pipelines.core": "12.1.10",
|
||||||
"com.unity.searcher": "4.9.1"
|
"com.unity.searcher": "4.9.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -145,7 +145,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.xr.core-utils": {
|
"com.unity.xr.core-utils": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.xr.interaction.toolkit": {
|
"com.unity.xr.interaction.toolkit": {
|
||||||
"version": "2.1.1",
|
"version": "2.2.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -192,13 +192,13 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.xr.openxr": {
|
"com.unity.xr.openxr": {
|
||||||
"version": "1.5.3",
|
"version": "1.7.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.xr.management": "4.0.1",
|
"com.unity.xr.management": "4.0.1",
|
||||||
"com.unity.xr.legacyinputhelpers": "2.1.2",
|
"com.unity.xr.legacyinputhelpers": "2.1.2",
|
||||||
"com.unity.inputsystem": "1.4.2"
|
"com.unity.inputsystem": "1.4.4"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -25,18 +25,20 @@ MonoBehaviour:
|
|||||||
m_Scopes: []
|
m_Scopes: []
|
||||||
m_IsDefault: 1
|
m_IsDefault: 1
|
||||||
m_Capabilities: 7
|
m_Capabilities: 7
|
||||||
- m_Id: scoped:Ultraleap
|
m_ConfigSource: 0
|
||||||
|
- m_Id: scoped:project:Ultraleap
|
||||||
m_Name: Ultraleap
|
m_Name: Ultraleap
|
||||||
m_Url: https://package.openupm.com
|
m_Url: https://package.openupm.com
|
||||||
m_Scopes:
|
m_Scopes:
|
||||||
- com.ultraleap
|
- com.ultraleap
|
||||||
m_IsDefault: 0
|
m_IsDefault: 0
|
||||||
m_Capabilities: 0
|
m_Capabilities: 0
|
||||||
|
m_ConfigSource: 4
|
||||||
m_UserSelectedRegistryName: Ultraleap
|
m_UserSelectedRegistryName: Ultraleap
|
||||||
m_UserAddingNewScopedRegistry: 0
|
m_UserAddingNewScopedRegistry: 0
|
||||||
m_RegistryInfoDraft:
|
m_RegistryInfoDraft:
|
||||||
m_Modified: 0
|
m_Modified: 0
|
||||||
m_ErrorMessage:
|
m_ErrorMessage:
|
||||||
m_UserModificationsInstanceId: -826
|
m_UserModificationsInstanceId: -830
|
||||||
m_OriginalInstanceId: -828
|
m_OriginalInstanceId: -834
|
||||||
m_LoadAssets: 0
|
m_LoadAssets: 0
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
--- !u!129 &1
|
--- !u!129 &1
|
||||||
PlayerSettings:
|
PlayerSettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 23
|
serializedVersion: 24
|
||||||
productGUID: 38df8e7f073e9b44aab6a7df0b3b50a2
|
productGUID: 38df8e7f073e9b44aab6a7df0b3b50a2
|
||||||
AndroidProfiler: 0
|
AndroidProfiler: 0
|
||||||
AndroidFilterTouchesWhenObscured: 0
|
AndroidFilterTouchesWhenObscured: 0
|
||||||
@@ -181,10 +181,10 @@ PlayerSettings:
|
|||||||
StripUnusedMeshComponents: 0
|
StripUnusedMeshComponents: 0
|
||||||
VertexChannelCompressionMask: 4054
|
VertexChannelCompressionMask: 4054
|
||||||
iPhoneSdkVersion: 988
|
iPhoneSdkVersion: 988
|
||||||
iOSTargetOSVersionString: 11.0
|
iOSTargetOSVersionString: 12.0
|
||||||
tvOSSdkVersion: 0
|
tvOSSdkVersion: 0
|
||||||
tvOSRequireExtendedGameController: 0
|
tvOSRequireExtendedGameController: 0
|
||||||
tvOSTargetOSVersionString: 11.0
|
tvOSTargetOSVersionString: 12.0
|
||||||
uIPrerenderedIcon: 0
|
uIPrerenderedIcon: 0
|
||||||
uIRequiresPersistentWiFi: 0
|
uIRequiresPersistentWiFi: 0
|
||||||
uIRequiresFullScreen: 1
|
uIRequiresFullScreen: 1
|
||||||
@@ -633,7 +633,6 @@ PlayerSettings:
|
|||||||
switchReleaseVersion: 0
|
switchReleaseVersion: 0
|
||||||
switchDisplayVersion: 1.0.0
|
switchDisplayVersion: 1.0.0
|
||||||
switchStartupUserAccount: 0
|
switchStartupUserAccount: 0
|
||||||
switchTouchScreenUsage: 0
|
|
||||||
switchSupportedLanguagesMask: 0
|
switchSupportedLanguagesMask: 0
|
||||||
switchLogoType: 0
|
switchLogoType: 0
|
||||||
switchApplicationErrorCodeCategory:
|
switchApplicationErrorCodeCategory:
|
||||||
@@ -675,6 +674,7 @@ PlayerSettings:
|
|||||||
switchNativeFsCacheSize: 32
|
switchNativeFsCacheSize: 32
|
||||||
switchIsHoldTypeHorizontal: 0
|
switchIsHoldTypeHorizontal: 0
|
||||||
switchSupportedNpadCount: 8
|
switchSupportedNpadCount: 8
|
||||||
|
switchEnableTouchScreen: 1
|
||||||
switchSocketConfigEnabled: 0
|
switchSocketConfigEnabled: 0
|
||||||
switchTcpInitialSendBufferSize: 32
|
switchTcpInitialSendBufferSize: 32
|
||||||
switchTcpInitialReceiveBufferSize: 64
|
switchTcpInitialReceiveBufferSize: 64
|
||||||
@@ -687,6 +687,7 @@ PlayerSettings:
|
|||||||
switchNetworkInterfaceManagerInitializeEnabled: 1
|
switchNetworkInterfaceManagerInitializeEnabled: 1
|
||||||
switchPlayerConnectionEnabled: 1
|
switchPlayerConnectionEnabled: 1
|
||||||
switchUseNewStyleFilepaths: 0
|
switchUseNewStyleFilepaths: 0
|
||||||
|
switchUseLegacyFmodPriorities: 1
|
||||||
switchUseMicroSleepForYield: 1
|
switchUseMicroSleepForYield: 1
|
||||||
switchEnableRamDiskSupport: 0
|
switchEnableRamDiskSupport: 0
|
||||||
switchMicroSleepForYieldTime: 25
|
switchMicroSleepForYieldTime: 25
|
||||||
@@ -786,19 +787,35 @@ PlayerSettings:
|
|||||||
webGLLinkerTarget: 1
|
webGLLinkerTarget: 1
|
||||||
webGLThreadsSupport: 0
|
webGLThreadsSupport: 0
|
||||||
webGLDecompressionFallback: 0
|
webGLDecompressionFallback: 0
|
||||||
|
webGLPowerPreference: 2
|
||||||
scriptingDefineSymbols:
|
scriptingDefineSymbols:
|
||||||
Standalone: LIV_UNIVERSAL_RENDER
|
Standalone: LIV_UNIVERSAL_RENDER
|
||||||
additionalCompilerArguments: {}
|
additionalCompilerArguments: {}
|
||||||
platformArchitecture: {}
|
platformArchitecture: {}
|
||||||
scriptingBackend:
|
scriptingBackend:
|
||||||
Standalone: 1
|
Standalone: 0
|
||||||
il2cppCompilerConfiguration: {}
|
il2cppCompilerConfiguration: {}
|
||||||
managedStrippingLevel: {}
|
managedStrippingLevel:
|
||||||
|
EmbeddedLinux: 1
|
||||||
|
GameCoreScarlett: 1
|
||||||
|
GameCoreXboxOne: 1
|
||||||
|
Lumin: 1
|
||||||
|
Nintendo Switch: 1
|
||||||
|
PS4: 1
|
||||||
|
PS5: 1
|
||||||
|
Stadia: 1
|
||||||
|
Standalone: 1
|
||||||
|
WebGL: 1
|
||||||
|
Windows Store Apps: 1
|
||||||
|
XboxOne: 1
|
||||||
|
iPhone: 1
|
||||||
|
tvOS: 1
|
||||||
incrementalIl2cppBuild: {}
|
incrementalIl2cppBuild: {}
|
||||||
suppressCommonWarnings: 1
|
suppressCommonWarnings: 1
|
||||||
allowUnsafeCode: 1
|
allowUnsafeCode: 1
|
||||||
useDeterministicCompilation: 1
|
useDeterministicCompilation: 1
|
||||||
enableRoslynAnalyzers: 1
|
enableRoslynAnalyzers: 1
|
||||||
|
selectedPlatform: 0
|
||||||
additionalIl2CppArgs:
|
additionalIl2CppArgs:
|
||||||
scriptingRuntimeVersion: 1
|
scriptingRuntimeVersion: 1
|
||||||
gcIncremental: 1
|
gcIncremental: 1
|
||||||
@@ -878,6 +895,7 @@ PlayerSettings:
|
|||||||
m_VersionName:
|
m_VersionName:
|
||||||
apiCompatibilityLevel: 6
|
apiCompatibilityLevel: 6
|
||||||
activeInputHandler: 2
|
activeInputHandler: 2
|
||||||
|
windowsGamepadBackendHint: 0
|
||||||
cloudProjectId:
|
cloudProjectId:
|
||||||
framebufferDepthMemorylessMode: 0
|
framebufferDepthMemorylessMode: 0
|
||||||
qualitySettingsNames: []
|
qualitySettingsNames: []
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
m_EditorVersion: 2021.3.12f1
|
m_EditorVersion: 2021.3.22f1
|
||||||
m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1)
|
m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3)
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
- [Brokenithm-iOS](https://github.com/esterTion/Brokenithm-iOS)
|
- [Brokenithm-iOS](https://github.com/esterTion/Brokenithm-iOS)
|
||||||
- [IL2cppStartProcess](https://github.com/josh4364/IL2cppStartProcess)
|
- [IL2cppStartProcess](https://github.com/josh4364/IL2cppStartProcess)
|
||||||
- [MaiDXR](https://github.com/xiaopeng12138/MaiDXR)
|
- [MaiDXR](https://github.com/xiaopeng12138/MaiDXR)
|
||||||
|
- [PrefabLightmapping](https://github.com/Ayfel/PrefabLightmapping)
|
||||||
- [uWindowCapture](https://github.com/hecomi/uWindowCapture)
|
- [uWindowCapture](https://github.com/hecomi/uWindowCapture)
|
||||||
|
|
||||||
## Disclaimers
|
## Disclaimers
|
||||||
@@ -59,11 +60,11 @@ Thank you to Glub Glub for releasing this!
|
|||||||
|
|
||||||
### Manual
|
### Manual
|
||||||
- Make sure the game properly and uses latest xxxxtools.
|
- Make sure the game properly and uses latest xxxxtools.
|
||||||
- Download [the nightly version of WACVR](https://nightly.link/xiaopeng12138/WACVR/workflows/build/main/artifact.zip).
|
- Download [the latest release version](https://github.com/xiaopeng12138/WACVR/releases) or [the nightly version of WACVR](https://nightly.link/xiaopeng12138/WACVR/workflows/build/main/artifact.zip).
|
||||||
- You have 2 ways to connect touch to the game. Please only choose one of them:
|
- You have 2 ways to connect touch to the game. Please only choose one of them:
|
||||||
|
|
||||||
#### mercuryio
|
#### mercuryio
|
||||||
- Download [mercuryio.dll](https://wacvr.cf/mercuryio.dll).
|
- You can find the ``mercuryio.dll`` inside the release file or you can download it [here](https://wacvr.xpengs.com/mercuryio.dll).
|
||||||
- Put ``mercuryio.dll`` into ``bin`` folder.
|
- Put ``mercuryio.dll`` into ``bin`` folder.
|
||||||
- Add ``[touch] enable=1`` to .ini file
|
- Add ``[touch] enable=1`` to .ini file
|
||||||
- Add ``[mercuryio] path=mercuryio.dll`` to .ini file.
|
- Add ``[mercuryio] path=mercuryio.dll`` to .ini file.
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ static unsigned int __stdcall mercury_io_touch_thread_proc(void *ctx)
|
|||||||
memcpy(cellPressed, FileMapping->TouchIoStatus, 240);
|
memcpy(cellPressed, FileMapping->TouchIoStatus, 240);
|
||||||
}
|
}
|
||||||
callback(cellPressed);
|
callback(cellPressed);
|
||||||
//Sleep(1);
|
Sleep(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
FileMapping->RGBAData[3] = 0x00; //IPC idle flag
|
FileMapping->RGBAData[3] = 0x00; //IPC idle flag
|
||||||
|
|||||||
Reference in New Issue
Block a user