Skip to content

Commit

Permalink
Merge pull request #156 from MidraLab/fix/ai_chat_over_ui_position
Browse files Browse the repository at this point in the history
fix: ai chatのover uiの大きさの調節
  • Loading branch information
ayutaz authored Feb 9, 2025
2 parents c341e23 + c042d5d commit 25d9ac3
Show file tree
Hide file tree
Showing 6 changed files with 528 additions and 202 deletions.
257 changes: 257 additions & 0 deletions Assets/uDesktopMascot/Resources/UI/Dialog/AIChatDialog.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ MonoBehaviour:
scrollRect: {fileID: 8779691265405822760}
chatText: {fileID: 1344068280679628811}
llmCharacter: {fileID: 6112206522812407479}
overNoticeImage: {fileID: 1074599737070819918}
overNoticeLocalizedStringEvent: {fileID: 6232266151296785395}
overNoticeText: {fileID: 2311959014395122854}
--- !u!225 &1326064579903162146
CanvasGroup:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1221,6 +1224,7 @@ RectTransform:
- {fileID: 2167108824899840028}
- {fileID: 5629550984155948161}
- {fileID: 3345971494748052864}
- {fileID: 4797523435701992499}
m_Father: {fileID: 6176751824365673}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -1531,6 +1535,82 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0.5, y: 1}
--- !u!1 &6868175706039386672
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4797523435701992499}
- component: {fileID: 2333165823466660938}
- component: {fileID: 1074599737070819918}
m_Layer: 5
m_Name: OverNotice
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4797523435701992499
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6868175706039386672}
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: 2352085434358176630}
m_Father: {fileID: 8677491949241970153}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: 0, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2333165823466660938
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6868175706039386672}
m_CullTransparentMesh: 1
--- !u!114 &1074599737070819918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6868175706039386672}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.3882353}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6894284249605628521
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3133,3 +3213,180 @@ RectTransform:
m_AnchoredPosition: {x: -540, y: -960}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9168241360658085519
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2352085434358176630}
- component: {fileID: 216042647339066042}
- component: {fileID: 2311959014395122854}
- component: {fileID: 6232266151296785395}
m_Layer: 5
m_Name: Message
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2352085434358176630
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9168241360658085519}
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: []
m_Father: {fileID: 4797523435701992499}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &216042647339066042
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9168241360658085519}
m_CullTransparentMesh: 1
--- !u!114 &2311959014395122854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9168241360658085519}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
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:
m_Calls: []
m_text: "\u30E2\u30C7\u30EB\u306E\\n\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D..."
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a4ac5cd8892e24e4790c00e0ef00a927, type: 2}
m_sharedMaterial: {fileID: 3991398196324383077, guid: a4ac5cd8892e24e4790c00e0ef00a927, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &6232266151296785395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9168241360658085519}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
m_Name:
m_EditorClassIdentifier:
m_StringReference:
m_TableReference:
m_TableCollectionName: GUID:e0bc4458d73676a429c1b840d5dbc577
m_TableEntryReference:
m_KeyId: 5814746641797120
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_FormatArguments: []
m_UpdateString:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2311959014395122854}
m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
m_MethodName: set_text
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 1
references:
version: 2
RefIds: []
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
* [requirements](#requirements)
* [license](#license)
* [素材について](#素材について)
* [インストーラー作成方法](#インストーラー作成方法)
* [Windows](#windows)
* [macOS](#macos)
* [制作者クレジット](#制作者クレジット)
* [3rd Party Notices](#3rd-party-notices)
* [sponsor](#sponsor)
Expand Down Expand Up @@ -48,6 +51,9 @@
* GLB/GLTF形式のモデルをサポートしています。(アニメーションは対応していません)
* FBX形式のモデルをサポートしています。(ただし一部のモデルではテクスチャーがロードができません。またアニメーションは対応していません)
* テクスチャーは StreamingAssets/textures/ に配置することで読み込むことができます。
* モデル選択・追加画面からVRMモデルの追加
* パスを指定して追加
* ファイル選択ダイアログから追加

</details>

Expand Down Expand Up @@ -114,6 +120,14 @@ QualityLevel=2
* TGA
* TIFF
* 背景色は、カラーコードを指定することができます。
* メニュー画面から以下の機能にアクセス可能
* モデル選択・追加画面
* AIチャット機能
* LocalWeb機能
* アプリケーション設定
* アプリケーション終了
* メニュー画面の収納ボタンを押すことで、Windowsのみ通知領域にアプリケーションを収納できます。
* 収納したアプリケーションは、通知領域のアイコンをクリックすることで、再度表示できます。

</details>

Expand Down
Loading

0 comments on commit 25d9ac3

Please sign in to comment.