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

Compare commits

base: JiNan:2b33e3e4c5ed6e9ba39501b88c4cb756df681ffa
Branches Tags
JiNan:NewMaster
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main
..
compare: JiNan:7a6967194db468a9b031004f463c08cadfc5a2ed
Branches Tags
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:NewMaster
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main

No commits in common. "2b33e3e4c5ed6e9ba39501b88c4cb756df681ffa" and "7a6967194db468a9b031004f463c08cadfc5a2ed" have entirely different histories.
2b33e3e4c5 ... 7a6967194d

9 changed files with 1733 additions and 1508 deletions
Show Stats Expand all files Collapse all files

33
Assets/Art/Fonts/pingfangSc/PingFangSC-Medium SDF.asset
View File

File diff suppressed because one or more lines are too long

9
Assets/Art/UIPrefab/UIInput_AnHuiBaoShi.prefab
View File

@ -867,7 +867,7 @@ MonoBehaviour:
- 1.762
- 1.762
- 1.762
- 1.762
- 1.770
errowIntMax: 0
errowIntMin: 0
errowTip: {fileID: 4587500071564332747}
@ -4229,7 +4229,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6879366414658697298
RectTransform:
m_ObjectHideFlags: 0
@ -6209,10 +6209,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\r\n\r\n5\u6B21\u6D4B\u91CF\u6298\u5C04\u7387\u6570\u636E\u4E3A\uFF1A\r\n\r\n\u7B2C\u4E00\u6B21
1.762\u2014\u20141.769\r\n\r\n\u7B2C\u4E8C\u6B21 1.762\u2014\u20141.770\r\n\r\n\u7B2C\u4E09\u6B21
1.762\u2014\u20141.769\r\n\r\n\u7B2C\u56DB\u6B21 1.762\u2014\u20141.770\r\n\r\n\u7B2C\u4E94\u6B21
1.762\u2014\u20141.768\n"
m_text: "\r\n\r\n5\u6B21\u6D4B\u91CF\u6298\u5C04\u7387\u6570\u636E\u4E3A\uFF1A\r\n\r\n1.762\u2014\u20141.769\r\n\r\n1.762\u2014\u20141.770\r\n\r\n1.762\u2014\u20141.769\r\n\r\n1.762\u2014\u20141.770\r\n\r\n1.762\u2014\u20141.770\n"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}

16
Assets/Scenes/ExameScene/ZheSheYiScene.unity
View File

@ -348,7 +348,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
m_FillAmount: 0.724
m_FillAmount: 0.6
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
@ -496,7 +496,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 196564542}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.1}
m_LocalPosition: {x: 0, y: 0, z: 0.124}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -504,7 +504,7 @@ RectTransform:
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: -2.477, y: -14.3}
m_AnchoredPosition: {x: -2.477, y: -8.306}
m_SizeDelta: {x: 5.175, y: 5.828}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &196564544
@ -532,7 +532,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
m_FillAmount: 0.202
m_FillAmount: 0.6
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
@ -3050,7 +3050,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
m_FillAmount: 0.72
m_FillAmount: 0.66
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
@ -3679,7 +3679,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
m_FillAmount: 0.73
m_FillAmount: 0.65
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
@ -4958,7 +4958,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
m_FillAmount: 0.707
m_FillAmount: 0.6
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
@ -5457,7 +5457,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
m_FillAmount: 0.72
m_FillAmount: 0.63
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0

1667
Assets/Scenes/FenGuangJing.unity
View File

File diff suppressed because one or more lines are too long

4
Assets/Scripts/UI/UIInput_AnHuiBaoShi.cs
View File

@ -184,7 +184,7 @@ namespace QFramework.Example
if (v != userInput)
{
//第3次，填入正确答案
if (errowIntMax >= 3)
if (errowIntMax >= 2)
{
InputFieldmax.text = targetMax[CurrentInputIndex].ToString();
@ -225,7 +225,7 @@ namespace QFramework.Example
if (v != userInput)
{
//第四次，填入正确答案
if (errowIntMin >= 3)
if (errowIntMin >= 2)
{
InputFieldmin.text = targetMin[CurrentInputIndex].ToString();

74
Data/Xml/BaoShiZhuoMoJiaGong.xml
View File

@ -111,16 +111,16 @@
<Item step="宝石琢磨加工" name="1.切割下料" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="2.粗磨毛坯" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="3.粘胶上杆" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="4.圈磨腰形" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="5.冠部研磨" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="6.冠部抛光" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="7.宝石翻胶" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="8.亭部研磨" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="9.亭部抛光" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="10.脱胶清洗" sum="10" bind=""/>
<Item step="宝石琢磨加工" name="1.切割下料" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="2.粗磨毛坯" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="3.粘胶上杆" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="4.圈磨腰形" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="5.冠部研磨" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="6.冠部抛光" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="7.宝石翻胶" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="8.亭部研磨" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="9.亭部抛光" sum="2" bind=""/>
<Item step="宝石琢磨加工" name="10.脱胶清洗" sum="2" bind=""/>
@ -190,9 +190,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工1.切割下料"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -232,9 +232,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工1.切割下料"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -494,8 +494,6 @@
<Condition type="ObjClick" value="Main/SM_YanMoJi/Box082/系统参数_Obj" ></Condition>
<Action type="HighLightFlash" value="Main/SM_YanMoJi/Box082/系统参数_Obj" isHigh="false" color="255,0,0,255"></Action>
<Action type="SetScore" name="宝石琢磨加工2.粗磨毛坯" value="5"></Action>
<Action type="Show" value="Main/SM_YanMoJi/Box082/Canvas/图2" isShow="true"></Action>
@ -526,7 +524,6 @@
<Action type="HighLightFlash" value="Main/SM_YanMoJi/ZhuanSuTiaoJieKaiGuan" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
<Condition type="ObjClick" value="Main/SM_YanMoJi/ZhuanSuTiaoJieKaiGuan" ></Condition>
<Action type="HighLightFlash" value="Main/SM_YanMoJi/ZhuanSuTiaoJieKaiGuan" isHigh="false" color="255,0,0,255"></Action>
<Action type="SetScore" name="宝石琢磨加工2.粗磨毛坯" value="3"></Action>
<Action type="TimeLine" value="TimeLines/ZhuanSuTiaoJieKaiGuan_Opean" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="90"></Action>
@ -581,7 +578,7 @@
<Action type="HighLightFlash" value="Main/BaoShi_QieGeChuLaiDe" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
<Condition type="ObjClick" value="Main/BaoShi_QieGeChuLaiDe" ></Condition>
<Action type="HighLightFlash" value="Main/BaoShi_QieGeChuLaiDe" isHigh="false" color="255,0,0,255"></Action>
<Action type="SetScore" name="宝石琢磨加工2.粗磨毛坯" value="2"></Action>
<!--相机视角-->
<Action type="Move" value="FlyCamera" to="-2.08801484,1.27899337,-3.7536242" time="0"></Action>
<Action type="Rotate" value="FlyCamera" to="33.2670326,178.548508,0" time="0"></Action>
@ -622,9 +619,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="10"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工3.粘胶上杆"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -722,9 +719,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工4.圈磨腰形"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -760,9 +757,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="3"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工4.圈磨腰形"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -843,9 +840,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="2"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工4.圈磨腰形"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -900,7 +897,7 @@
<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="SetScore" name="宝石琢磨加工5.冠部研磨" value="10"></Action>
<!--八角手。磨盘-->
<Action type="TimeLine" value="TimeLines/YouKaBiaoChi_BianQuanMoBianCeLiang" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
<!--游卡标尺，测量，数字变小 9122-->
@ -946,9 +943,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="10"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工6.冠部抛光"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -1039,9 +1036,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工7.宝石翻胶"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -1085,9 +1082,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工7.宝石翻胶"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -1129,7 +1126,7 @@
<Action type="Show" value="Main/SM_YanMoJi/DingPingQi" isShow="false"></Action>
<Action type="SetScore" name="宝石琢磨加工8.亭部研磨" value="10"></Action>
<!--平头粘竿，八角手冠磨-->
<Action type="TimeLine" value="TimeLines/BaJiaoShouGuanMo_PingTouZhanGan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
@ -1166,9 +1163,9 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="10"
rightScore="5.2"
wrongScore=""
scoreStepName="宝石琢磨加工9.亭部抛光"
scoreStepName="操作准备物品准备"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -1211,13 +1208,10 @@
<Action type="HighLightFlash" value="Main/BaJiaoShou/ZhanGan (1)" isHigh="false" color="255,0,0,255"></Action>
<Action type="SetScore" name="宝石琢磨加工10.脱胶清洗" value="10"></Action>
<!--酒精灯 烤软粘竿，镊子取下宝石，放入容器中进行清洗，然后取出-->
<Action type="TimeLine" value="TimeLines/TuoJiaoQingXi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="400"></Action>
<Action type="TipWindow" value="恭喜你完成当前模块 得分:{Score}" btns="确定" ></Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
<Action type="NextOperation"></Action>
</Action>

12
Data/Xml/ShuiReFaHeCheng.xml
View File

@ -136,7 +136,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="20"
rightScore="14.28"
wrongScore=""
random="true"
scoreStepName="紫外荧光灯1.肉眼观察"
@ -181,7 +181,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="20"
rightScore="14.28"
wrongScore=""
random="true"
scoreStepName="紫外荧光灯2.均质体/非均质体检测"
@ -267,7 +267,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="20"
rightScore="14.28"
wrongScore=""
random="true"
scoreStepName="紫外荧光灯3.折射率检测"
@ -486,7 +486,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="20"
rightScore="14.28"
wrongScore=""
random="true"
scoreStepName="紫外荧光灯4.放大检测"
@ -602,7 +602,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="14.28"
wrongScore=""
random="true"
scoreStepName="紫外荧光灯5.密度检测"
@ -735,7 +735,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="5"
rightScore="14.28"
wrongScore=""
random="true"
scoreStepName="紫外荧光灯6.紫外荧光检测"

14
Data/Xml/YuDiaoDeZhiZuo.xml
View File

@ -166,7 +166,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作1.选料、标记"
autoHide="1">
@ -209,7 +209,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作2.出大型"
autoHide="1">
@ -297,7 +297,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作3.定中线"
autoHide="1">
@ -345,7 +345,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作4.定中心孔位"
autoHide="1">
@ -493,7 +493,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作5.初稿雕琢"
autoHide="1">
@ -549,7 +549,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作5.初稿雕琢"
autoHide="1">
@ -624,7 +624,7 @@
wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="12.5"
rightScore="14.28"
wrongScore=""
scoreStepName="玉雕的制作6.细雕"
autoHide="1">

2
Data/Xml/ZiWaiYingGuangDeng.xml
View File

@ -75,7 +75,7 @@
<!--随便配置的分数模块-->
<Score>
<Item step="紫外荧光灯的使用" name="1.放置宝石" sum="0" bind=""/>
<!--<Item step="1111" name="1111" sum="2" bind=""/>-->
</Score>