Skip to content

Commit

Permalink
0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
tori29umai0123 committed Mar 11, 2023
1 parent 44fac57 commit 7c4f067
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 95 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ VideoCaptureLib_Log.txt
*.sln
OpenAI_API/wav/input.wav
myconfig.ini
Assets/Example-StandAloneWin_Scripts.meta
Assets/Example-StandAloneWin_Scripts
Assets/UniRx.meta
Assets/UniRx
114 changes: 21 additions & 93 deletions Assets/Scenes/AI_load.unity
Original file line number Diff line number Diff line change
Expand Up @@ -359,82 +359,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 379940868}
m_CullTransparentMesh: 1
--- !u!1 &423615454
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 423615455}
- component: {fileID: 423615457}
- component: {fileID: 423615456}
m_Layer: 5
m_Name: background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &423615455
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 423615454}
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: 960310162}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &423615456
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 423615454}
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: 1, g: 1, b: 1, a: 0.84313726}
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!222 &423615457
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 423615454}
m_CullTransparentMesh: 1
--- !u!1 &466223547
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -460,7 +384,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 466223547}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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
Expand Down Expand Up @@ -594,7 +518,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 665060374}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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
Expand Down Expand Up @@ -816,7 +740,7 @@ GameObject:
- component: {fileID: 960310160}
- component: {fileID: 960310159}
m_Layer: 5
m_Name: Backgroun_Canvas
m_Name: Responce_Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -880,7 +804,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_UpdateRectTransformForStandalone: 1
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand All @@ -896,7 +820,6 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 423615455}
- {fileID: 1819082941}
m_Father: {fileID: 0}
m_RootOrder: 4
Expand Down Expand Up @@ -1182,7 +1105,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1119022345}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 391.3888, y: -356.64484, z: 3600.389}
m_LocalPosition: {x: 391.38873, y: -356.64484, z: 3600.3892}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -1215,7 +1138,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1146434792}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 391.3888, y: -356.64484, z: 3600.389}
m_LocalPosition: {x: 391.38873, y: -356.64484, z: 3600.3892}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -1627,8 +1550,8 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1559341517
Transform:
--- !u!224 &1559341517
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -1642,6 +1565,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1559341520
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1702,14 +1630,14 @@ MonoBehaviour:
MODE:
AI_thinking: {fileID: 1908081827}
Voice_rec: {fileID: 1905019050}
BG: {fileID: 423615456}
Text_input: {fileID: 1119022345}
Voice_input: {fileID: 1146434792}
text_inputField: {fileID: 1765409448}
voice_inputField: {fileID: 975702159}
Voice_responce: {fileID: 674607477}
Voice_send: {fileID: 1460635614}
background: {fileID: 1000119249}
Camera: {fileID: 1915289385}
BG_responce: {fileID: 1819082940}
--- !u!114 &1559341524
MonoBehaviour:
Expand Down Expand Up @@ -2440,18 +2368,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1819082940}
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 13.528686, y: 13.528686, z: 13.528686}
m_LocalScale: {x: 0.999, y: 0.99000007, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 960310162}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -417}
m_SizeDelta: {x: 133, y: 14.67}
m_AnchoredPosition: {x: 0, y: -418}
m_SizeDelta: {x: 1800, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1819082942
MonoBehaviour:
Expand All @@ -2473,7 +2401,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ee4fd79618c5e164287394a56c6560db, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -2957,7 +2885,7 @@ Camera:
m_GameObject: {fileID: 1915289383}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 1, b: 0, a: 1}
m_projectionMatrixMode: 1
m_GateFitMode: 2
Expand All @@ -2975,7 +2903,7 @@ Camera:
far clip plane: 1000
field of view: 30
orthographic: 0
orthographic size: 5
orthographic size: 5.4
m_Depth: 0
m_CullingMask:
serializedVersion: 2
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scripts/UImanager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ public class UImanager : MonoBehaviour
public string MODE = "text";
public Image AI_thinking;
public Image Voice_rec;
public Image BG;
public GameObject Text_input;
public GameObject Voice_input;
public TMP_InputField text_inputField;
public TMP_InputField voice_inputField;
public TextMeshProUGUI Voice_responce;
public GameObject Voice_send;
public GameObject background;
public Camera Camera;
public GameObject BG_responce;

public void Start()
{
MODE = SystemSetting.InputMode;
BG.color = MyColorUtility.ToColor(SystemSetting.backgroundColor);
Camera.backgroundColor = MyColorUtility.ToColor(SystemSetting.backgroundColor);
}

private void settingAIthinking()
Expand Down

0 comments on commit 7c4f067

Please sign in to comment.