JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi

Browse Source
This commit is contained in:
丛刚 2025-03-10 10:09:38 +08:00
commit e418481e61
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Art/UIPrefab/UIHint.prefab
View File

@ -161,7 +161,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 972031421509758959} m_GameObject: {fileID: 972031421509758959}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name: m_Name:
@ -570,10 +570,10 @@ RectTransform:
- {fileID: 8714371631115409135} - {fileID: 8714371631115409135}
m_Father: {fileID: 1135463250226624301} m_Father: {fileID: 1135463250226624301}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 165.62491, y: -77.65634}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 302.7502, y: 101.3857}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7300578004067312478 --- !u!222 &7300578004067312478
CanvasRenderer: CanvasRenderer:
@ -637,8 +637,8 @@ MonoBehaviour:
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 2 m_HorizontalAlignment: 1
m_VerticalAlignment: 4096 m_VerticalAlignment: 256
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 0 m_characterSpacing: 0
m_wordSpacing: 0 m_wordSpacing: 0

4
Data/Xml/HuangJinShouShiJiaGong.xml
View File

@ -211,7 +211,7 @@
<Operation moduleType="Study" freeStep="true"> <Operation moduleType="Study" freeStep="true">
<Step name="黄金首饰加工工艺"> <!--<Step name="黄金首饰加工工艺">-->
<!--电子秤--> <!--电子秤-->
<Step name="1.称重"> <Step name="1.称重">
@ -1150,7 +1150,7 @@
</Step> <!--</Step>-->
</Operation> </Operation>

4
Data/Xml/YuDiaoDeZhiZuo.xml
View File

@ -101,7 +101,7 @@
<Operation moduleType="Study" freeStep="true"> <Operation moduleType="Study" freeStep="true">
<Step name="玉雕的制作"> <!--<Step name="玉雕的制作">-->
<Step name="1.选料、标记"> <Step name="1.选料、标记">
<Start> <Start>
<Action type="Sequence"> <Action type="Sequence">
@ -676,7 +676,7 @@
</Start> </Start>
</Step> </Step>
</Step> <!--</Step>-->
</Operation> </Operation>

4
Data/Xml/ZiWaiYingGuangDeng.xml
View File

@ -81,7 +81,7 @@
<Operation moduleType="Study" freeStep="true"> <Operation moduleType="Study" freeStep="true">
<Step name="紫外荧光灯的使用"> <!--<Step name="紫外荧光灯的使用">-->
<Step name="1.放置宝石"> <Step name="1.放置宝石">
<Start> <Start>
<Action type="Sequence"> <Action type="Sequence">
@ -310,7 +310,7 @@
</Step> </Step>
</Step> <!--</Step>-->
</Operation> </Operation>