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

Compare commits

base: JiNan:3b0b20b178135b772d9dc9e5ef1c41b4080722b3
Branches Tags
JiNan:main
JiNan:master
...
compare: JiNan:65996df57092f45ef674f7714a6bb52c7dabae1e
Branches Tags
JiNan:main
JiNan:master

10 Commits
3b0b20b178 ... 65996df570

Author SHA1 Message Date
Cg-Fly
65996df570 超数排卵考核开始角色消失 2025-02-12 14:13:24 +08:00
Cg-Fly
33c16240d4 子宫颈和子宫角交互点补充 2025-02-12 13:52:06 +08:00
Cg-Fly
b56fecb5d4 冲卵管的三个口标志 2025-02-12 13:31:59 +08:00
Cg-Fly
c9a5e939ea 修改人工授精交互点 2025-02-12 13:21:04 +08:00
Cg-Fly
0e9d9b90be 输精枪两侧交互点 2025-02-12 13:07:56 +08:00
Cg-Fly
df48578146 子宫角和卵巢亮点 2025-02-12 11:46:45 +08:00
Cg-Fly
4c6670f689 牛打针考核模式三个点全亮 2025-02-12 11:30:28 +08:00
Cg-Fly
50073701a0 考核模式手套穿戴利用交互点 2025-02-12 10:54:50 +08:00
Cg-Fly
ea4e2a86e2 考核模式上一步被选中 2025-02-12 10:21:08 +08:00
Cg-Fly
5cfb83ed70 点击了当前步骤交互内容，则上方提示框消失 2025-02-12 09:19:44 +08:00
5 changed files with 1509 additions and 28 deletions
Show Stats Expand all files Collapse all files

BIN
Assets/StreamingAssets/Excel/NiuData.xlsx
View File

Binary file not shown.

34
Assets/StreamingAssets/ExcelJson/NiuData.txt
View File

@ -302,7 +302,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 14,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -500,7 +500,7 @@
"ThreeTaskName": "孕激素法",
"TaskType": "动画",
"ToolsName": "",
"ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|YinDaoPoint_sign",
"ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|TailInjectionPoint_sign",
"Operation": "角色在牛脖子的位置，进行药物注射",
"ProcessDescription": "将含有一定量孕激素的专用栓塞放入牛阴道内，10天左右取出阴道栓，同时肌注4mL氯前列烯醇",
"SoundPath": "",
@ -952,7 +952,7 @@
"CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0",
"CameraNearTR2": "",
"QNextNum": 38,
"ExamModelBT": "",
"ExamModelBT": "LuanCaoPoint_sign|ZiGongJiaoPoint_sign",
"ExamTip": "请选择检查时正确的抓捏位置",
"ExamEvvr": "选择错误",
"Question": "",
@ -1290,7 +1290,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 52,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -1358,7 +1358,7 @@
"ThreeTaskName": "使用FSH进行超排",
"TaskType": "动画",
"ToolsName": "",
"ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|YinDaoPoint_sign",
"ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|TailInjectionPoint_sign",
"Operation": "角色在牛脖子的位置，进行药物注射",
"ProcessDescription": "在牛发情周期的9-13天之间的任意一天开始注射FSH",
"SoundPath": "",
@ -2434,7 +2434,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 96,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -2954,7 +2954,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 117,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -3162,7 +3162,7 @@
"CameraNearTR": "1.569078_-2.51265_0.1643406|22.295_0.520002_0",
"CameraNearTR2": "",
"QNextNum": 123,
"ExamModelBT": "",
"ExamModelBT": "shujingqiangMianSaiYesPoint_sign|shujingqiangMianSaiNoPoint_sign",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误",
"Question": "",
@ -3890,7 +3890,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 153,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -4150,7 +4150,7 @@
"CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0",
"CameraNearTR2": "",
"QNextNum": 161,
"ExamModelBT": "",
"ExamModelBT": "ZhuQiKouPoint_sign|ZhuYeKouPoint_sign|YeChuKouPoint_sign",
"ExamTip": "请选择正确的注气口注气",
"ExamEvvr": "选择错误",
"Question": "",
@ -4176,7 +4176,7 @@
"CameraNearTR": "2.065317_-2.305965_1.770304|50.11497_180.34_0",
"CameraNearTR2": "1.551287_-2.455041_0.7389933|1.494979_359.58_0",
"QNextNum": 164,
"ExamModelBT": "",
"ExamModelBT": "ZhuYeKouPoint_sign|ZhuQiKouPoint_sign|YeChuKouPoint_sign",
"ExamTip": "请选择正确的液入口注液",
"ExamEvvr": "选择错误",
"Question": "",
@ -4254,7 +4254,7 @@
"CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0",
"CameraNearTR2": "",
"QNextNum": 165,
"ExamModelBT": "",
"ExamModelBT": "YeChuKouPoint_sign|ZhuYeKouPoint_sign|ZhuQiKouPoint_sign",
"ExamTip": "请选择正确的回收液出口",
"ExamEvvr": "选择错误",
"Question": "",
@ -4618,7 +4618,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 180,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -5060,7 +5060,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 197,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -5398,7 +5398,7 @@
"CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0",
"CameraNearTR2": "",
"QNextNum": 212,
"ExamModelBT": "InInjectionPoint_sign|OutInjectionPoint_sign",
"ExamModelBT": "InPTYZInjectionPoint_sign|OutPTYZInjectionPoint_sign",
"ExamTip": "请选择送胚的位置",
"ExamEvvr": "选择错误",
"Question": "",
@ -5866,7 +5866,7 @@
"CameraNearTR": "",
"CameraNearTR2": "",
"QNextNum": 228,
"ExamModelBT": "",
"ExamModelBT": "Hand1_sign|Hand2_sign",
"ExamTip": "请选择拿起手套时的捏拿位置",
"ExamEvvr": "选择错误，应捏翻折部位",
"Question": "",
@ -6048,7 +6048,7 @@
"CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0",
"CameraNearTR2": "",
"QNextNum": 235,
"ExamModelBT": "",
"ExamModelBT": "InYYZDInjectionPoint_sign|OutYYZDInjectionPoint_sign",
"ExamTip": "请选择检查时正确的抓捏位置",
"ExamEvvr": "选择错误",
"Question": "",

1456
Assets/_Scenes/TrainExam.unity
View File

File diff suppressed because it is too large Load Diff

18
Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs
View File

@ -164,10 +164,12 @@ if(UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject())return
}
ClickToolCallInTrainState(rayHit.transform.gameObject, () =>
{
UI_Manage.Instance.HidePanel("ShowToastUIPrefab");
JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(), false);
});
ClickToolCallInExamState(rayHit.transform.gameObject, () =>
{
UI_Manage.Instance.HidePanel("ShowToastUIPrefab");
JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum), false);
});
}
@ -181,6 +183,7 @@ if(UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject())return
GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip);
videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(_CurSceneStep.VideoPath, () =>
{
UI_Manage.Instance.HidePanel("ShowToastUIPrefab");
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
});
});
@ -262,7 +265,10 @@ if(UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject())return
jiaziGeo.transform.localPosition = new Vector3(-0.3f, 0.5998f, 0.157f);
jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero);
_CSPLTran.Find("SM_Niu_ZhusheB_Bozi_an_B01(2)").gameObject.SetActive(true);
GameObject boziGeo = _CSPLTran.Find("SM_Niu_ZhusheB_Bozi_an_B01(2)").gameObject;
boziGeo.SetActive(true);
boziGeo.transform.Find("Yisheng_ok:Doctor").gameObject.SetActive(false);
boziGeo.transform.Find("SM_XiaoTuiChe_Zhusheqi").gameObject.SetActive(false);
}
else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_JZLVJC))
{
@ -595,11 +601,17 @@ if(UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject())return
}
if (tempBts[i].Contains("*"))
{
_curStepUseBTDic.Add(false, toolTemp);
if (!_curStepUseBTDic.ContainsKey(false))
{
_curStepUseBTDic.Add(false, toolTemp);
}
}
else
{
_curStepUseBTDic.Add(true, toolTemp);
if (!_curStepUseBTDic.ContainsKey(true))
{
_curStepUseBTDic.Add(true, toolTemp);
}
}
}
}

29
Assets/_Scripts/Application/UI/OperationStepPanel.cs
View File

@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.IO;
using UnityEngine;
using UnityEngine.UI;
/*******************************************************************************
*Create By CG
*Function
@ -328,11 +329,16 @@ namespace ZXK.LouDiXvMuNiu
}
}
//选项自身变化
Transform previousTran = null;
Transform seleTran = null;
for (int i = 0; i < _stepChildrens.Count; i++)
{
if (_stepChildrens[i].name.Equals(objLight.id.ToString()))
{
if (objLight.id > 1&&i>0)
{
previousTran= _stepChildrens[i-1].transform;
}
seleTran = _stepChildrens[i].transform;
}
if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState"))
@ -341,8 +347,24 @@ namespace ZXK.LouDiXvMuNiu
_stepChildrens[i].transform.Find("TextContent").GetComponent<Text>().color = Color.white;
}
}
Text nameTxt = seleTran.Find("TextContent").GetComponent<Text>();
nameTxt.color = new Color(25 / 255.0f, 224 / 255.0f, 224 / 255.0f);
if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
{
if (previousTran != null)
{
Text previousNameTxt = previousTran.Find("TextContent").GetComponent<Text>();
previousNameTxt.color = new Color(25 / 255.0f, 224 / 255.0f, 224 / 255.0f);
}
Text nameTxt = seleTran.Find("TextContent").GetComponent<Text>();
nameTxt.color = new Color(25 / 255.0f, 224 / 255.0f, 224 / 255.0f);
}
else
{
Text nameTxt = seleTran.Find("TextContent").GetComponent<Text>();
nameTxt.color = new Color(25 / 255.0f, 224 / 255.0f, 224 / 255.0f);
}
//根据子选项Transform找到大步骤选项变化
for (int i = 0; i < _stepBigs.Count; i++)
@ -399,6 +421,7 @@ namespace ZXK.LouDiXvMuNiu
{
PopUpMng.ThreeVideoChoicePanel(obj.Question, answers, answers, NiuSceneMng._Instance.GetOptionIndex(obj.OptionRight), isExam, () =>
{
UI_Manage.Instance.HidePanel("ShowToastUIPrefab");
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
});
}
@ -423,6 +446,7 @@ namespace ZXK.LouDiXvMuNiu
GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip);
videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(obj.VideoPath, () =>
{
UI_Manage.Instance.HidePanel("ShowToastUIPrefab");
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(obj.QNextNum);
});
}
@ -432,6 +456,7 @@ namespace ZXK.LouDiXvMuNiu
GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowNoCtrlPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip);
videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(obj.VideoPath, () =>
{
UI_Manage.Instance.HidePanel("ShowToastUIPrefab");
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
});
}