Skip to content
This repository was archived by the owner on Sep 17, 2022. It is now read-only.

Commit 10ffea6

Browse files
committed
Fixed comments issue
1 parent 19bc2cb commit 10ffea6

File tree

4 files changed

+34
-23
lines changed

4 files changed

+34
-23
lines changed

Assets/StreamingAssets/HiddenARCore.meta renamed to Assets/Animations.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Materials.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scenes/ARStage.unity

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ MonoBehaviour:
814814
m_OnCullStateChanged:
815815
m_PersistentCalls:
816816
m_Calls: []
817-
m_text: Welcome To ARgorithm
817+
m_text: Welcome To <color=#F9413C>AR</color>gorithm
818818
m_isRightToLeft: 0
819819
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
820820
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -1234,11 +1234,11 @@ RectTransform:
12341234
m_LocalScale: {x: 1, y: 1, z: 1}
12351235
m_Children: []
12361236
m_Father: {fileID: 1328576795}
1237-
m_RootOrder: 1
1237+
m_RootOrder: 0
12381238
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12391239
m_AnchorMin: {x: 0, y: 1}
12401240
m_AnchorMax: {x: 0, y: 1}
1241-
m_AnchoredPosition: {x: 119, y: -90.95}
1241+
m_AnchoredPosition: {x: 132.59409, y: -88.45465}
12421242
m_SizeDelta: {x: 140, y: 70}
12431243
m_Pivot: {x: 0.5, y: 0.5}
12441244
--- !u!114 &981664038
@@ -1890,15 +1890,15 @@ RectTransform:
18901890
m_LocalPosition: {x: 0, y: 0, z: 0}
18911891
m_LocalScale: {x: 1, y: 1, z: 1}
18921892
m_Children:
1893-
- {fileID: 1545845628}
18941893
- {fileID: 981664037}
1894+
- {fileID: 1545845628}
18951895
m_Father: {fileID: 1149782917}
18961896
m_RootOrder: 0
18971897
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1898-
m_AnchorMin: {x: 0, y: 0.8856622}
1898+
m_AnchorMin: {x: 0, y: 0}
18991899
m_AnchorMax: {x: 1, y: 1}
1900-
m_AnchoredPosition: {x: 0, y: 3.1000977}
1901-
m_SizeDelta: {x: 0, y: -6.1220703}
1900+
m_AnchoredPosition: {x: -0.014282227, y: 733.8}
1901+
m_SizeDelta: {x: 0.028503418, y: -1467.5352}
19021902
m_Pivot: {x: 0.5, y: 0.5}
19031903
--- !u!114 &1328576796
19041904
MonoBehaviour:
@@ -1913,7 +1913,7 @@ MonoBehaviour:
19131913
m_Name:
19141914
m_EditorClassIdentifier:
19151915
m_Material: {fileID: 0}
1916-
m_Color: {r: 0.16470589, g: 0.18039216, b: 0.19607843, a: 1}
1916+
m_Color: {r: 1, g: 1, b: 1, a: 0}
19171917
m_RaycastTarget: 1
19181918
m_Maskable: 1
19191919
m_OnCullStateChanged:
@@ -2147,12 +2147,12 @@ RectTransform:
21472147
m_LocalScale: {x: 1, y: 1, z: 1}
21482148
m_Children: []
21492149
m_Father: {fileID: 1328576795}
2150-
m_RootOrder: 0
2150+
m_RootOrder: 1
21512151
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2152-
m_AnchorMin: {x: 0, y: 0}
2153-
m_AnchorMax: {x: 1, y: 1}
2154-
m_AnchoredPosition: {x: 0, y: 0}
2155-
m_SizeDelta: {x: 0, y: 0}
2152+
m_AnchorMin: {x: 0, y: 1}
2153+
m_AnchorMax: {x: 0, y: 1}
2154+
m_AnchoredPosition: {x: 495.01425, y: -88.45465}
2155+
m_SizeDelta: {x: 484.84033, y: 85}
21562156
m_Pivot: {x: 0.5, y: 0.5}
21572157
--- !u!114 &1545845629
21582158
MonoBehaviour:
@@ -2237,7 +2237,7 @@ MonoBehaviour:
22372237
m_VertexBufferAutoSizeReduction: 1
22382238
m_useMaxVisibleDescender: 1
22392239
m_pageToDisplay: 1
2240-
m_margin: {x: 0, y: 0, z: 0, w: 0}
2240+
m_margin: {x: 0, y: 0, z: 0.00004484636, w: -2.893333}
22412241
m_isUsingLegacyAnimationComponent: 0
22422242
m_isVolumetricText: 0
22432243
m_hasFontAssetChanged: 0

Assets/Scripts/ARStage.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,21 @@ public void Next()
108108
}
109109
State args = stageData.states[index];
110110
Debug.Log(args.state_type);
111-
if (args.state_type != "comment")
111+
if (args.state_type == "comment")
112112
{
113-
string comment = args.comments;
114-
ChangeComments(comment);
115-
if (index + 1 < stageData.size)
116-
index++;
117-
else
118-
return;
113+
if (args.comments.Length > 0 || args.comments != " ")
114+
{
115+
ChangeComments(args.comments);
116+
}
117+
return;
119118
}
120119
string id = (string)args.state_def["id"];
121120
string funcType = args.state_type.Split('_').ToList()[1];
121+
if(args.comments.Length > 0 || args.comments != " ")
122+
{
123+
ChangeComments(args.comments);
124+
}
125+
122126
if (stageData.objectMap[id].rendered && funcType == "declare")
123127
{
124128
idToPlaceholderMap[id].SetActive(true);
@@ -135,7 +139,6 @@ public void Next()
135139
idToPlaceholderMap[id] = placeHolder;
136140
}
137141

138-
ChangeComments(args.comments);
139142
stageData.eventList[index](args, idToPlaceholderMap[id]);
140143
if (index + 1 < stageData.states.Count)
141144
{

0 commit comments

Comments
 (0)