Skip to content

Commit 346bbd5

Browse files
mimyqualitymimyquality
committed
スイベルチェアー2に座位置自動フィット機能追加
1 parent f1fa99e commit 346bbd5

20 files changed

Lines changed: 436 additions & 178 deletions

‎Packages/com.mimylab.fukuroudon/Runtime/GrabSlideDoor/Scripts/PickupHandle.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace MimyLab.FukuroUdon
1212
using VRC.SDK3.Components;
1313
using VRC.Udon;
1414

15-
[HelpURL("https://github.com/mimyquality/FukuroUdon/wiki/Grab-SlideDoor#%E4%BD%BF%E3%81%84%E6%96%B9")]
15+
[HelpURL("https://github.com/mimyquality/FukuroUdon/wiki/Fix-Pickup-Up#pickup-handle")]
1616
[Icon(ComponentIconPath.FukuroUdon)]
1717
[AddComponentMenu("Fukuro Udon/Fix Pickup Up/Pickup Handle")]
1818
[RequireComponent(typeof(VRCPickup))]

‎Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Prefabs/SwivelChair2.prefab‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ MonoBehaviour:
205205
_tooltip:
206206
- {fileID: 5575431909226903486}
207207
- {fileID: 6412023621156897431}
208-
- {fileID: 5575431909226903486}
209208
- {fileID: 4555264828869412194}
210209
longPushDuration: 0.8
211210
doubleTapDuration: 0.2
@@ -269,6 +268,7 @@ Transform:
269268
m_Children:
270269
- {fileID: 6549690713891397299}
271270
- {fileID: 3306099348672549534}
271+
- {fileID: 681244557837654784}
272272
m_Father: {fileID: 5023051306674047459}
273273
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
274274
--- !u!136 &3991469291490243253
@@ -339,6 +339,8 @@ MonoBehaviour:
339339
adjustMinLimit: {x: 0, y: -0.5, z: -0.3}
340340
adjustMaxLimit: {x: 0, y: 0.5, z: 0.3}
341341
adjustSpeed: 0.5
342+
autoAdjustWhenSitting: 0
343+
_seatPoint: {fileID: 681244557837654784}
342344
forwardSnapThrethold: 5
343345
rotateSpeed: 60
344346
--- !u!114 &1492424945538542309
@@ -366,6 +368,37 @@ MonoBehaviour:
366368
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgAAAAAAAAAABwUHBQ==
367369
publicVariablesUnityEngineObjects: []
368370
publicVariablesSerializationDataFormat: 0
371+
--- !u!1 &6001685995014091731
372+
GameObject:
373+
m_ObjectHideFlags: 0
374+
m_CorrespondingSourceObject: {fileID: 0}
375+
m_PrefabInstance: {fileID: 0}
376+
m_PrefabAsset: {fileID: 0}
377+
serializedVersion: 6
378+
m_Component:
379+
- component: {fileID: 681244557837654784}
380+
m_Layer: 0
381+
m_Name: SeatPoint
382+
m_TagString: Untagged
383+
m_Icon: {fileID: 0}
384+
m_NavMeshLayer: 0
385+
m_StaticEditorFlags: 0
386+
m_IsActive: 1
387+
--- !u!4 &681244557837654784
388+
Transform:
389+
m_ObjectHideFlags: 0
390+
m_CorrespondingSourceObject: {fileID: 0}
391+
m_PrefabInstance: {fileID: 0}
392+
m_PrefabAsset: {fileID: 0}
393+
m_GameObject: {fileID: 6001685995014091731}
394+
serializedVersion: 2
395+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
396+
m_LocalPosition: {x: 0, y: 0.5, z: 0}
397+
m_LocalScale: {x: 1, y: 1, z: 1}
398+
m_ConstrainProportionsScale: 0
399+
m_Children: []
400+
m_Father: {fileID: 7935774349952570831}
401+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
369402
--- !u!1 &6341106352454824208
370403
GameObject:
371404
m_ObjectHideFlags: 0

Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Prefabs/Tooltip_Android.prefab renamed to Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Prefabs/Tooltip_Mobile.prefab

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
10-
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1,
11-
type: 3}
11+
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1, type: 3}
1212
propertyPath: m_RootOrder
1313
value: 0
1414
objectReference: {fileID: 0}
15-
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1,
16-
type: 3}
15+
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1, type: 3}
1716
propertyPath: m_LocalPosition.x
1817
value: 0
1918
objectReference: {fileID: 0}
20-
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1,
21-
type: 3}
19+
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1, type: 3}
2220
propertyPath: m_LocalPosition.y
2321
value: 0
2422
objectReference: {fileID: 0}
25-
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1,
26-
type: 3}
23+
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1, type: 3}
2724
propertyPath: m_LocalEulerAnglesHint.x
2825
value: 0
2926
objectReference: {fileID: 0}
30-
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1,
31-
type: 3}
27+
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1, type: 3}
3228
propertyPath: m_LocalEulerAnglesHint.y
3329
value: 0
3430
objectReference: {fileID: 0}
35-
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1,
36-
type: 3}
31+
- target: {fileID: 422426354404137075, guid: c804c86fa2229564690216a408cf92b1, type: 3}
3732
propertyPath: m_LocalEulerAnglesHint.z
3833
value: 0
3934
objectReference: {fileID: 0}
40-
- target: {fileID: 1372155499888670513, guid: c804c86fa2229564690216a408cf92b1,
41-
type: 3}
35+
- target: {fileID: 1372155499888670513, guid: c804c86fa2229564690216a408cf92b1, type: 3}
4236
propertyPath: m_Name
43-
value: Tooltip_Android
37+
value: Tooltip_Mobile
4438
objectReference: {fileID: 0}
45-
- target: {fileID: 5298421657796292597, guid: c804c86fa2229564690216a408cf92b1,
46-
type: 3}
39+
- target: {fileID: 4200218235230817212, guid: c804c86fa2229564690216a408cf92b1, type: 3}
40+
propertyPath: m_AdditionalShaderChannelsFlag
41+
value: 25
42+
objectReference: {fileID: 0}
43+
- target: {fileID: 5298421657796292597, guid: c804c86fa2229564690216a408cf92b1, type: 3}
4744
propertyPath: m_text
4845
value: Double-Tap JUMP button to exit.
4946
objectReference: {fileID: 0}
5047
m_RemovedComponents: []
48+
m_RemovedGameObjects: []
49+
m_AddedGameObjects: []
50+
m_AddedComponents: []
5151
m_SourcePrefab: {fileID: 100100000, guid: c804c86fa2229564690216a408cf92b1, type: 3}

Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Prefabs/Tooltip_Android.prefab.meta renamed to Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Prefabs/Tooltip_Mobile.prefab.meta

File renamed without changes.

‎Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Scripts/SC2Caster.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ private void Initialize()
3939

4040
_initialized = true;
4141
}
42-
private void Start()
43-
{
44-
Initialize();
45-
}
4642

4743
public void Move(Vector3 inputValue)
4844
{

‎Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Scripts/SC2InputManager.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ MonoBehaviour:
9797
Data: 6|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
9898
- Name: tooltip
9999
Entry: 1
100-
Data: "0 = PCVR \n1 = Desktop \n2 = Quest \n3 = Android"
100+
Data: "0 = VR \n1 = Desktop \n2 = Quest \n3 = Mobile"
101101
- Name:
102102
Entry: 8
103103
Data:

‎Packages/com.mimylab.fukuroudon/Runtime/SwivelChair2/Scripts/SC2InputManager.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace MimyLab.FukuroUdon
1919
public class SC2InputManager : UdonSharpBehaviour
2020
{
2121
[SerializeField]
22-
[Tooltip("0 = PCVR \n1 = Desktop \n2 = Quest \n3 = Android")]
22+
[Tooltip("0 = VR \n1 = Desktop \n2 = Quest \n3 = Mobile")]
2323
private GameObject[] _tooltip = new GameObject[0];
2424

2525
[Min(0.0f), Tooltip("sec")]
@@ -54,9 +54,7 @@ private void Initialize()
5454
if (_initialized) { return; }
5555

5656
_platform = Networking.LocalPlayer.IsUserInVR() ? SwivelChairPlayerPlatform.VR : SwivelChairPlayerPlatform.Desktop;
57-
#if UNITY_ANDROID || UNITY_IOS
58-
_platform = Networking.LocalPlayer.IsUserInVR() ? SwivelChairPlayerPlatform.VR : SwivelChairPlayerPlatform.Mobile;
59-
#endif
57+
if (InputManager.GetLastUsedInputMethod() == VRCInputMethod.Touch) { _platform = SwivelChairPlayerPlatform.Mobile; }
6058

6159
if (_caster) { _casterRigidbody = _caster.GetComponent<Rigidbody>(); }
6260

0 commit comments

Comments
 (0)