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

合并，提交修改bug

Browse Source
This commit is contained in:
李浩 2025-03-26 18:03:43 +08:00
parent fce0e6a981
commit cfec67fd9d
5 changed files with 120 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Assets/Art/Fonts/PingFang Medium SDF.asset
View File

File diff suppressed because one or more lines are too long

6
Assets/Art/UIPrefab/UIDeviceTip.prefab
View File

@ -117,7 +117,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 12321
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
@ -199,7 +199,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
MarkType: 0
CustomComponentName:
CustomComponentName: Label
CustomComment:
mComponentName: TMPro.TextMeshProUGUI
--- !u!1 &6870530999289627961
@ -279,7 +279,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 18.08
--- !u!114 &6262412644488086412
MonoBehaviour:
m_ObjectHideFlags: 0

23
Data/Xml/BaoShiZhuoMoJiaGong.xml
View File

@ -650,7 +650,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent="物品准备失败"
rightScore="10"
rightScore="5"
wrongScore=""
scoreStepName="宝石琢磨加工3.粘胶上杆"
autoHide="1"
@ -697,9 +697,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent="物品准备失败"
rightScore="5.2"
rightScore="5"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="宝石琢磨加工3.粘胶上杆"
autoHide="1"
wrongCount="3">
</Action>
@ -1023,11 +1023,12 @@
<!--扳手更换。磨盘-->
<Action type="TimeLine" value="TimeLines/GengHuanXiMoPan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="540"></Action>
<!--磨盘自动旋转，普通磨盘隐藏-->
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="false"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="true"></Action>
<Action type="Show" value="Main/BaJiaoShou" isShow="true"></Action>
<!--细磨盘自动旋转，普通磨盘隐藏-->
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="false"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_XiMian_Opean_Loop" isShow="true"></Action>
<!--两次宝石研磨。角度1，角度2-->
<Action type="TimeLine" value="TimeLines/YouKaBiaoChi_BianQuanMoBianCeLiang" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
@ -1067,10 +1068,6 @@
<Action type="Rotate" value="FlyCamera" to="24.762,-176.761,0" time="0"></Action>
<!--磨盘自动旋转，普通磨盘隐藏-->
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="false"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="false"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_XiMian_Opean_Loop" isShow="true"></Action>
<!--点击粘竿。-->
<Action type="HighLightFlash" value="Main/BaJiaoShou/ZhanGan (1)" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
@ -1207,6 +1204,10 @@
<Action type="SetScore" name="宝石琢磨加工8.亭部研磨" value="10"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_XiMian_Opean_Loop" isShow="false"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Opean_Loop" isShow="true"></Action>
<Action type="Show" value="Main/SM_YanMoJi/MoPan_Mesh" isShow="false"></Action>
<!--平头粘竿，八角手冠磨-->
<Action type="TimeLine" value="TimeLines/BaJiaoShouGuanMo_PingTouZhanGan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>

103
Data/Xml/ZhuBaoGongZuoTaiDeRenZhi.xml
View File

@ -21,6 +21,9 @@
<Action type="Move" value="FlyCamera" to="-0.1851438,1.835464,-0.4507396" time="0"></Action>
<Action type="Rotate" value="FlyCamera" to="21.85509,178.494,-2.874648E-08" time="0"></Action>
<!--<Action type="UIShow" value="UIBackPack" isShow="true"></Action>-->
<Action type="UIBackPack" devices="台塞,金粉回收抽屉,氧气焊接机,小火枪,玛瑙刀,锉刀,台灯,锯弓,砂纸卷,水盅,煮明矾水杯,剪刀,珠宝钳,铅笔,钛针,手术刀,方铁,机针,胶水,砂纸条,直尺,焊瓦,游标卡尺,胶锤"
random="true"
scrollSpeed="25"
@ -1130,7 +1133,7 @@
<!--随便配置的分数模块-->
<!--<Operation moduleType="Study" freeStep="true">
<Operation moduleType="Study" freeStep="true">
<Step name="工具列表">
@ -1140,7 +1143,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1168,7 +1171,7 @@
<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/1"></Condition>
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1179,7 +1182,7 @@
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1201,7 +1204,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1212,7 +1215,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1234,7 +1237,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1245,7 +1248,7 @@
<Step name="氧气焊接机">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1263,7 +1266,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1273,7 +1276,7 @@
<Step name="小火枪">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1291,7 +1294,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1304,7 +1307,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1322,7 +1325,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1333,7 +1336,7 @@
<Step name="锉刀">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1351,7 +1354,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1362,7 +1365,7 @@
<Step name="台灯">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1379,7 +1382,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1389,7 +1392,7 @@
<Step name="锯弓">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1406,7 +1409,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1415,7 +1418,7 @@
<Step name="砂纸卷">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1432,7 +1435,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1442,7 +1445,7 @@
<Step name="水盅">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1458,7 +1461,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1468,7 +1471,7 @@
<Step name="煮明矾水杯">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1485,7 +1488,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1497,7 +1500,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1515,7 +1518,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1526,7 +1529,7 @@
<Step name="珠宝钳">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1543,7 +1546,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1555,7 +1558,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1571,7 +1574,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1581,7 +1584,7 @@
<Step name="钛针">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1599,7 +1602,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1609,7 +1612,7 @@
<Step name="手术刀">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1626,7 +1629,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1637,7 +1640,7 @@
<Step name="方铁">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1654,7 +1657,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1664,7 +1667,7 @@
<Step name="机针">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1681,7 +1684,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1691,7 +1694,7 @@
<Step name="胶水">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1708,7 +1711,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1718,7 +1721,7 @@
<Step name="砂纸条">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1735,7 +1738,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1744,7 +1747,7 @@
<Step name="直尺">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1761,7 +1764,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1770,7 +1773,7 @@
<Step name="游标卡尺">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1787,7 +1790,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1797,7 +1800,7 @@
<Step name="胶锤">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉，归位--><!--
金粉回收抽屉，归位
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1814,7 +1817,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1823,6 +1826,6 @@
</Step>
</Operation>-->
</Operation>
</Module>

2
Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml
View File

@ -22,6 +22,8 @@
<Action type="Move" value="FlyCamera" to="0.0845993,1.371632,2.146553" time="0"></Action>
<Action type="Rotate" value="FlyCamera" to="21.66745,356.097,-5.741785E-08" time="0"></Action>
<!--<Action type="UIShow" value="UIBackPack" isShow="true"></Action>-->
<Action type="UIBackPack" devices="偏光镜,棱镜式分光镜,光栅式分光镜,光纤灯,折射仪,显微镜,密度仪,紫外荧光灯"
random="true"
scrollSpeed="25"