Skip to content

Commit

Permalink
v1.1.0対応コミット
Browse files Browse the repository at this point in the history
- デバッグコードの記法変更
事前に定数として保存しておく
- リファクタリング
- UserIDLoader - 複数のTextMeshProUGUIへの出力に対応
- Update VerifyUserTeleporter.cs
自動テレポートが動作しない不具合を修正
- アセットファイルの更新
- パッケージファイルの更新
  • Loading branch information
sh0ou authored Aug 28, 2024
1 parent 7e4427d commit cb786b8
Show file tree
Hide file tree
Showing 14 changed files with 397 additions and 71 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ crashlytics-build.properties
Packages/vpm-manifest.json
Packages/packages-lock.json
Packages/manifest.json
/.vscode
7 changes: 6 additions & 1 deletion Packages/jp.sh0uroom.vrcid-gimmick/CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ UserIDLoaderで、TextUIが指定されてない時にエラーが出る不具

v1.0.2(ギミック変更なし)
ライセンスファイルを同梱
READMEにクレジットのお願いを記載
READMEにクレジットのお願いを記載

v1.1.0
UserIDLoaderのテキスト出力について、複数のTextMeshProUGUIへの出力に対応
UserTeleporterで、自動テレポートが動作しない不具合を修正
その他コードの整理
7 changes: 7 additions & 0 deletions Packages/jp.sh0uroom.vrcid-gimmick/CHANGELOG.txt.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Packages/jp.sh0uroom.vrcid-gimmick/Editor/UserIDLoaderEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class UserIDLoaderEditor : Editor
private SerializedProperty isInputURL;
private SerializedProperty targetURL;
private SerializedProperty isOutputLog;
private SerializedProperty textUI;
private SerializedProperty textUIs;
private SerializedProperty userIDs;

public override void OnInspectorGUI()
Expand All @@ -31,7 +31,7 @@ private void GetProperties()
{
isInputURL = serializedObject.FindProperty("isInputURL");
isOutputLog = serializedObject.FindProperty("isOutputLog");
textUI = serializedObject.FindProperty("textUI");
textUIs = serializedObject.FindProperty("textUIs");

targetURL = serializedObject.FindProperty("targetURL");
userIDs = serializedObject.FindProperty("userIDs");
Expand All @@ -42,7 +42,7 @@ private void ShowBaseGUI()
//URLで指定するか、手動で指定するか選択するボタン
EditorGUILayout.BeginHorizontal();
{
EditorGUILayout.PrefixLabel("IDの設定方法");
EditorGUILayout.PrefixLabel("IDの指定方法");
if (isInputURL.boolValue)
{
if (GUILayout.Button("URLから取得する"))
Expand Down Expand Up @@ -71,18 +71,18 @@ private void ShowBaseGUI()
}

//Textに出力するかどうか
if (isOutputText || textUI.objectReferenceValue != null)
if (isOutputText || textUIs.arraySize > 0)
{
EditorGUILayout.BeginHorizontal();
{
EditorGUILayout.PropertyField(textUI, new GUIContent("出力先のTextMeshPro"));
if (GUILayout.Button("x", GUILayout.Width(40)))
if (GUILayout.Button("TextUIへの出力をやめる"))
{
textUI.objectReferenceValue = null;
textUIs.arraySize = 0;
isOutputText = false;
}
}
EditorGUILayout.EndHorizontal();
EditorGUILayout.PropertyField(textUIs, new GUIContent("出力先のTextMeshPro"), true);
}
else
{
Expand Down
7 changes: 7 additions & 0 deletions Packages/jp.sh0uroom.vrcid-gimmick/LICENSE.txt.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Packages/jp.sh0uroom.vrcid-gimmick/README.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
*==========*==========*
VRCID Gimmicker v1.0.2
VRCID Gimmicker
*==========*==========*

Author: sh0u
Twitter: https://twitter.com/sh0ou
Discord: sh0ou
E-mail: [email protected]

当ツールは「MIT License」を適用しています。
改変したツールを配布する際、同梱の「LICENSE.txt」も同梱して配布してください。
Expand Down
11 changes: 8 additions & 3 deletions Packages/jp.sh0uroom.vrcid-gimmick/Runtime/Canvas_IDLog.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RectTransform:
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: 0
m_Children: []
m_Father: {fileID: 6843560926004694362}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -60,6 +60,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -162,10 +163,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2}
m_LocalScale: {x: 0.005, y: 0.005, z: 0.005}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6843560926004694362}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand All @@ -189,7 +190,9 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 1
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand All @@ -215,6 +218,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!114 &6843560925879320495
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -260,10 +264,10 @@ RectTransform:
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: 0
m_Children:
- {fileID: 6843560924783863132}
m_Father: {fileID: 6843560925879320530}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -293,6 +297,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down
Loading

0 comments on commit cb786b8

Please sign in to comment.