diff --git a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab index 4f06788..cdcd68b 100644 --- a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab +++ b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab @@ -1223,7 +1223,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8052589572268344594 RectTransform: m_ObjectHideFlags: 0 @@ -7143,7 +7143,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1507436169004188609 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 4bc8086..fd54fc7 100644 Binary files a/Assets/StreamingAssets/Excel/NiuData.xlsx and b/Assets/StreamingAssets/Excel/NiuData.xlsx differ diff --git a/Assets/StreamingAssets/ExcelJson/NiuData.txt b/Assets/StreamingAssets/ExcelJson/NiuData.txt index 7675c12..7d6a9b0 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -825,7 +825,7 @@ "ExamModelBT": "", "ExamTip": "", "ExamEvvr": "", - "Question": "奶牛产奶正常，排尿和饮食规律，没有变化。是否将该母牛转入单独牛栏中观察？", + "Question": "母牛产奶正常，排尿和饮食规律，没有变化。是否将该母牛转入单独牛栏中观察？", "OptionsAll": "A、是|B、否", "OptionErro": "A", "OptionRight": "B", @@ -851,7 +851,7 @@ "ExamModelBT": "", "ExamTip": "", "ExamEvvr": "", - "Question": "奶牛焦躁不安，易兴奋，食欲减退。是否将该母牛转入单独牛栏中观察？", + "Question": "母牛焦躁不安，易兴奋，食欲减退，外阴有粘液流出。是否将该母牛转入单独牛栏中观察？", "OptionsAll": "A、是|B、否", "OptionErro": "B", "OptionRight": "A", @@ -2686,7 +2686,7 @@ "ToolsName": "", "ModelBT": "", "Operation": "", - "ProcessDescription": "母牛人工授精‌是指通过人工方法将处理及保存后的公牛精液，利用器械将精液注入母牛生殖道内，使其受孕，从而代替自然交配的一种繁殖技术。", + "ProcessDescription": "母牛人工授精是指通过人工方法将处理及保存后的公牛精液，利用器械将精液注入母牛生殖道内，使其受孕，从而代替自然交配的一种繁殖技术。", "SoundPath": "N036", "VideoPath": "", "TimelineLength": 0, @@ -2712,7 +2712,7 @@ "ToolsName": "", "ModelBT": "", "Operation": "", - "ProcessDescription": "1、提高配种效率‌：人工授精可以大幅提高优良种公牛的配种效率。自然交配时，一头公牛一次只能使一头母牛受孕，而人工授精技术可以使一次射精的精液用于多头母牛，显著提高了配种效率‌。\n2、防止疾病传播‌：人工授精可以避免公母牛生殖器官的直接接触，从而防止疾病的传播，如阴道滴虫病和传染性阴道炎‌。\n3、节省成本‌：通过购买精液进行人工授精，可以避免饲养种公牛的费用，节省了牧场饲养种公牛的成本。\n4、提高受胎率‌：通过严格规范的输精方法和时间把控，可以提高母牛的受胎率。", + "ProcessDescription": "1、提高配种效率：人工授精可以大幅提高优良种公牛的配种效率。自然交配时，一头公牛一次只能使一头母牛受孕，而人工授精技术可以使一次射精的精液用于多头母牛，显著提高了配种效率。\n2、防止疾病传播：人工授精可以避免公母牛生殖器官的直接接触，从而防止疾病的传播，如阴道滴虫病和传染性阴道炎。\n3、节省成本：通过购买精液进行人工授精，可以避免饲养种公牛的费用，节省了牧场饲养种公牛的成本。\n4、提高受胎率：通过严格规范的输精方法和时间把控，可以提高母牛的受胎率。", "SoundPath": "N037", "VideoPath": "", "TimelineLength": 0, @@ -3163,7 +3163,7 @@ "CameraNearTR2": "", "QNextNum": 123, "ExamModelBT": "shujingqiangMianSaiYesPoint_sign|shujingqiangMianSaiNoPoint_sign", - "ExamTip": "请按顺序进行相关操作", + "ExamTip": "请选择插入输精枪的一端", "ExamEvvr": "选择错误", "Question": "", "OptionsAll": "", @@ -4257,7 +4257,7 @@ "ExamModelBT": "", "ExamTip": "", "ExamEvvr": "", - "Question": "冲卵完毕后，应在子宫体中，以冲卵管灌注（ ）80万单位、（ ）100万单位和氯前列烯醇4ml", + "Question": "冲卵完毕后，应在子宫体中，以冲卵管灌注青霉素（ ）万单位、链霉素（ ）万单位和氯前列烯醇4ml", "OptionsAll": "A、20、40|B、80、100|C、40、20|D、100、80", "OptionErro": "A|C|D", "OptionRight": "B", @@ -4324,7 +4324,7 @@ "ToolsName": "", "ModelBT": "", "Operation": "", - "ProcessDescription": "在显微镜下根据胚胎分裂与否、形态色调、分裂球大小、均匀度、细胞的密度、透明带以及变性情况等鉴定。\n 1.未受精卵。没有分裂球及细胞团的卵子。\n 2.桑葚胚。发情后5-6天冲出的卵，只能观察到球状的细胞团，分不清分裂球。细胞团占据透明带内腔的大部分。\n 3.致密桑葚胚。发情后第6-7天回收的卵，细胞团变小，占透明带内腔的60%-70%。\n 4.早期囊胚。发情后第7-8天冲出的卵，细胞的一部分出现发亮的胚泡腔。细胞团占透明内腔的70%-80%，难以分清内细胞团和滋养层。\n 5.囊胚。发情后第7-8天回收的胚胎，内细胞团和滋养层界线清晰，胚泡腔明显，细胞充满透明带内腔。\n 6.扩张囊胚。发情后第8-9天回收的胚胎，胚泡腔明显扩大，体积增大到原来的1.2 -1.5倍，与透明带之间无空隙，透明带变薄，相当于正常厚度的1/3。\n 7.孵育胚。在发情后第9-11天回收的胚胎，由于胚泡腔继续扩张，致使透明带破裂，卵细胞脱出。", + "ProcessDescription": "在显微镜下根据胚胎分裂与否、形态色调、分裂球大小、均匀度、细胞的密度、透明带以及变性情况等鉴定。\n1.未受精卵。没有分裂球及细胞团的卵子。\n2.桑葚胚。发情后5-6天冲出的卵，只能观察到球状的细胞团，分不清分裂球。细胞团占据透明带内腔的大部分。\n3.致密桑葚胚。发情后第6-7天回收的卵，细胞团变小，占透明带内腔的60%-70%。\n4.早期囊胚。发情后第7-8天冲出的卵，细胞的一部分出现发亮的胚泡腔。细胞团占透明内腔的70%-80%，难以分清内细胞团和滋养层。\n5.囊胚。发情后第7-8天回收的胚胎，内细胞团和滋养层界线清晰，胚泡腔明显，细胞充满透明带内腔。\n6.扩张囊胚。发情后第8-9天回收的胚胎，胚泡腔明显扩大，体积增大到原来的1.2 -1.5倍，与透明带之间无空隙，透明带变薄，相当于正常厚度的1/3。\n7.孵育胚。在发情后第9-11天回收的胚胎，由于胚泡腔继续扩张，致使透明带破裂，卵细胞脱出。", "SoundPath": "N078", "VideoPath": "", "TimelineLength": 0, @@ -4350,7 +4350,7 @@ "ToolsName": "", "ModelBT": "", "Operation": "", - "ProcessDescription": "冲出的胚胎一般分为A、B、C、D共4级。\n A级：胚胎形态完整，轮廓清晰呈球形，分裂球大小均匀，结构紧凑，色调和透明度适中，无附着的细胞和液泡。\n B级：轮廓清晰，色调及细胞密度良好，可见到一些附着的细胞和液泡。\n C级：轮廓不清，色调发暗，结构较松散，游离的细胞或液体较多，变性的细胞达30% -50%。\n D级：未受精卵、有碎片的退化卵及变性细胞超过一半的胚胎。\n A级、B级、C级胚胎为可用胚胎，其中，A级、B级为可冷冻胚胎，C级胚胎只能用于鲜胚移植，D级胚胎为不可用胚胎。", + "ProcessDescription": "冲出的胚胎一般分为A、B、C、D共4级。\nA级：胚胎形态完整，轮廓清晰呈球形，分裂球大小均匀，结构紧凑，色调和透明度适中，无附着的细胞和液泡。\nB级：轮廓清晰，色调及细胞密度良好，可见到一些附着的细胞和液泡。\nC级：轮廓不清，色调发暗，结构较松散，游离的细胞或液体较多，变性的细胞达30% -50%。\nD级：未受精卵、有碎片的退化卵及变性细胞超过一半的胚胎。\nA级、B级、C级胚胎为可用胚胎，其中，A级、B级为可冷冻胚胎，C级胚胎只能用于鲜胚移植，D级胚胎为不可用胚胎。", "SoundPath": "N079", "VideoPath": "", "TimelineLength": 0, @@ -4792,7 +4792,7 @@ "ToolsName": "", "ModelBT": "", "Operation": "", - "ProcessDescription": "桑葚胚（M）移植给发情时间为第5-6天受体母牛（发情为0d）；\n 早期囊胚（EB）移植给发情时间为第5.5-6.5天受体母牛；\n 囊胚（B）移植给发情时间为第6-7天受体母牛；\n 扩张囊胚（EXB）移植给发情时间为第7～8天受体母牛。", + "ProcessDescription": "桑葚胚（M）移植给发情时间为第5-6天受体母牛（发情为0d）；\n早期囊胚（EB）移植给发情时间为第5.5-6.5天受体母牛；\n囊胚（B）移植给发情时间为第6-7天受体母牛；\n扩张囊胚（EXB）移植给发情时间为第7～8天受体母牛。", "SoundPath": "N084", "VideoPath": "", "TimelineLength": 0, @@ -5494,7 +5494,7 @@ "ToolsName": "", "ModelBT": "", "Operation": "", - "ProcessDescription": "母牛配种后19-22天子宫变化不明显，如果卵巢上有发育良好的黄体，可怀疑已受孕。\n 妊娠30天后两侧子宫大小开始不一，孕角略为变粗质地松软，有波动感，孕角的子宫壁变薄；空角较坚实，有弹性。用手握住孕角，轻轻滑动时可感到有胎囊，用拇指与食指捏起子宫角，然后放松，可感到子宫腔内有胎囊滑过。胎囊在40天时才有球形感，直径达3.5-4cm。\n 妊娠60天后，孕角大小为空角的2倍左右，波动感明显，角间沟变得宽平，子宫向腹腔下垂，但依然能摸到整个子宫。\n 妊娠90天，孕角的直径长到10-12cm，波动极明显；空角也增大1倍，角间沟消失，子宫开始沉向腹腔，初产牛下沉要晚些。子宫颈前移，有时能摸到胎儿。孕侧的子宫动脉出现微弱的妊娠脉搏。\n 妊娠120天，子宫全部沉入腹腔，子宫颈越过耻骨前缘，一般只能摸到两侧的子宫角。子叶明显，可摸到胎儿，孕侧子宫动脉的妊娠脉搏已向下延伸，可明显感到脉动。\n 妊娠150 天，子宫膨大，沉入前腹腔区，子叶增长到胡桃核到鸡蛋大小，子宫动脉增粗，达手指粗细。空角子宫也增粗，出现妊娠脉搏。子宫动脉沿荐骨前行，在荐骨与腰椎交界的岬部前方，可摸到主动脉的最后一个分支，称髂内动脉。在左右两根髂内动脉的根部，顺子宫阔韧带下行，可摸到子宫动脉。", + "ProcessDescription": "母牛配种后19-22天子宫变化不明显，如果卵巢上有发育良好的黄体，可怀疑已受孕。\n妊娠30天后两侧子宫大小开始不一，孕角略为变粗质地松软，有波动感，孕角的子宫壁变薄；空角较坚实，有弹性。用手握住孕角，轻轻滑动时可感到有胎囊，用拇指与食指捏起子宫角，然后放松，可感到子宫腔内有胎囊滑过。胎囊在40天时才有球形感，直径达3.5-4cm。\n妊娠60天后，孕角大小为空角的2倍左右，波动感明显，角间沟变得宽平，子宫向腹腔下垂，但依然能摸到整个子宫。\n妊娠90天，孕角的直径长到10-12cm，波动极明显；空角也增大1倍，角间沟消失，子宫开始沉向腹腔，初产牛下沉要晚些。子宫颈前移，有时能摸到胎儿。孕侧的子宫动脉出现微弱的妊娠脉搏。\n妊娠120天，子宫全部沉入腹腔，子宫颈越过耻骨前缘，一般只能摸到两侧的子宫角。子叶明显，可摸到胎儿，孕侧子宫动脉的妊娠脉搏已向下延伸，可明显感到脉动。\n妊娠150天，子宫膨大，沉入前腹腔区，子叶增长到胡桃核到鸡蛋大小，子宫动脉增粗，达手指粗细。空角子宫也增粗，出现妊娠脉搏。子宫动脉沿荐骨前行，在荐骨与腰椎交界的岬部前方，可摸到主动脉的最后一个分支，称髂内动脉。在左右两根髂内动脉的根部，顺子宫阔韧带下行，可摸到子宫动脉。", "SoundPath": "N099", "VideoPath": "", "TimelineLength": 0, diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index e16e317..a5945f6 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -10199,6 +10199,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -4649654264093766027, guid: cd6c96f65c462d84d8376b0dc1ed9c74, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2614580431881444022, guid: cd6c96f65c462d84d8376b0dc1ed9c74, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1846963360440233997, guid: cd6c96f65c462d84d8376b0dc1ed9c74, type: 3} propertyPath: m_IsActive @@ -30945,6 +30955,16 @@ PrefabInstance: propertyPath: m_TagString value: nohide objectReference: {fileID: 0} + - target: {fileID: -4649654264093766027, guid: 75d184e5e77f85248908f8b7da22fc30, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2614580431881444022, guid: 75d184e5e77f85248908f8b7da22fc30, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} propertyPath: m_Name diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index a6be5f1..d73d156 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -800,8 +800,14 @@ namespace ZXK.LouDiXvMuNiu } else { - PopUpMng.PopAnswerQuestions(step.Question, answers, GetOptionIndex(step.OptionRight), () => + PopUpMng.PopAnswerQuestions(step.Question, answers, GetOptionIndex(step.OptionRight), (isResultright) => { + if (isResultright) + { + GameManager.Instance._DataNiuHandler.AddScore(_CurSceneStep.ModuleName, + _CurSceneStep.ThreeTaskName, _CurSceneStep.Score); + } + JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum), false); }); } @@ -905,6 +911,12 @@ namespace ZXK.LouDiXvMuNiu float a = 0.0f; DOTween.To(() => a, x => x = a, 1.0f, 2.0f).OnComplete(() => { + if (tempGeo.name.Equals(temp[0])) + { + NiuData curStep = GameManager.Instance._DataNiuHandler.CurNiuHandler.Value; + GameManager.Instance._DataNiuHandler.AddScore(curStep.ModuleName, curStep.ThreeTaskName, curStep.Score); + } + for (int i = 0; i < togs.Count; i++) { togs[i].SetActive(false); diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index 55d3aa7..ee8c437 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -108,18 +108,18 @@ namespace ZXK.LouDiXvMuNiu private void Update() { - if (Input.GetKey(KeyCode.Z)) - { - KinematicCharacterMotor kinematic = Camera.main.GetComponent()._CameraCtrl.transform.GetComponent(); - ExampleCharacterCamera characterCamera = Camera.main.GetComponent(); - - Vector3 pos = kinematic.transform.position; - float rotY = kinematic.transform.rotation.eulerAngles.y; - Vector3 rot = new Vector3(characterCamera.transform.rotation.eulerAngles.x, rotY, 0); - int index = GameManager.Instance._DataNiuHandler.CurNiuHandler.Value.id; - string cameraTRInfo = string.Format("{0}_{1}_{2}|{3}_{4}_{5}", pos.x, pos.y, pos.z, rot.x, rot.y, rot.z); - GetWedage("TempReadCameraPos_N").GetComponent().text = cameraTRInfo; - } + // if (Input.GetKey(KeyCode.Z)) + // { + // KinematicCharacterMotor kinematic = Camera.main.GetComponent()._CameraCtrl.transform.GetComponent(); + // ExampleCharacterCamera characterCamera = Camera.main.GetComponent(); + // + // Vector3 pos = kinematic.transform.position; + // float rotY = kinematic.transform.rotation.eulerAngles.y; + // Vector3 rot = new Vector3(characterCamera.transform.rotation.eulerAngles.x, rotY, 0); + // int index = GameManager.Instance._DataNiuHandler.CurNiuHandler.Value.id; + // string cameraTRInfo = string.Format("{0}_{1}_{2}|{3}_{4}_{5}", pos.x, pos.y, pos.z, rot.x, rot.y, rot.z); + // GetWedage("TempReadCameraPos_N").GetComponent().text = cameraTRInfo; + // } } protected override void OnDestroy() @@ -274,12 +274,13 @@ namespace ZXK.LouDiXvMuNiu UI_Manage.Instance.ClosePanel("ThreeVideoChoicePrefab"); } - UpdateTaskType(obj); + // UpdateTaskType(obj); UpdateSelectItem(obj); WordExplain(obj); - + + bool pass = false; if (GameManager.Instance._DataNiuHandler.CurNiuHandler.Value.TaskName == ConstCtrl.TaskName_ActualOperation) { imgIntroduceGeo.SetActive(false); @@ -294,17 +295,20 @@ namespace ZXK.LouDiXvMuNiu GameObject showTitleUIGeo = UI_Manage.Instance.ShowPanel("ShowTitleUIPrefab", Type.GetType("ZXK.LouDiXvMuNiu.ShowTitleUIPrefab"), UIGroup.Tip); showTitleUIGeo.GetComponent().SetTextAudMsg(obj.ThreeTaskName, obj.ThreeTaskName, () => { + UpdateTaskType(obj); WordTip(obj); }); } else { + UpdateTaskType(obj); WordTip(obj); } _nextBtn.GetComponent().anchoredPosition = new Vector2(890.0f, 966.0f); } else if(GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskName == ConstCtrl.TaskName_OperationPlan) { + UpdateTaskType(obj); WordTip(obj); } diff --git a/Assets/_Scripts/Application/UI/SelectToolsPanel.cs b/Assets/_Scripts/Application/UI/SelectToolsPanel.cs index e1dcd5b..dfa4ba3 100644 --- a/Assets/_Scripts/Application/UI/SelectToolsPanel.cs +++ b/Assets/_Scripts/Application/UI/SelectToolsPanel.cs @@ -79,13 +79,14 @@ namespace ZXK.LouDiXvMuNiu toolItemGeo.transform.Find("BeUseImg").gameObject.SetActive(true); toolItemGeo.transform.Find("BeUseImg/ChoseRight").gameObject.SetActive(true); GameManager.Instance._EventManager.Raise(new ClickToolArgs() { SelectTool = toolItemGeo.name }); - GameManager.Instance._DataNiuHandler.AddScore(curStep.ModuleName, curStep.ThreeTaskName, 1); + // GameManager.Instance._DataNiuHandler.AddScore(curStep.ModuleName, curStep.ThreeTaskName, 1); _curToolNumber++; if (_curToolNumber == _allTools) { PopUpMng.PopChoseRightToast("е׼", 2.0f,()=> { NiuData nextStep = GameManager.Instance._DataNiuHandler.GetNextStep(); GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = nextStep; + GameManager.Instance._DataNiuHandler.AddScore(curStep.ModuleName, curStep.ThreeTaskName, curStep.Score); }); } } diff --git a/Assets/_Scripts/Framework/Utilities/PopUpMng.cs b/Assets/_Scripts/Framework/Utilities/PopUpMng.cs index 9d76828..97fc204 100644 --- a/Assets/_Scripts/Framework/Utilities/PopUpMng.cs +++ b/Assets/_Scripts/Framework/Utilities/PopUpMng.cs @@ -65,7 +65,7 @@ namespace CG.UTility /// /// /// - public static void PopAnswerQuestions(string question, string[] answer,int rightNumber, System.Action configBtnEvent) + public static void PopAnswerQuestions(string question, string[] answer,int rightNumber, System.Action configBtnEvent) { _TriAble = false; GameObject alertGeo = UI_Manage.Instance.ShowPanel("AnswerQuestionsPrefab", System.Type.GetType("CG.Framework.UIBase"), UIGroup.Tip); @@ -91,8 +91,9 @@ namespace CG.UTility Image rightImg = answerContain.GetChild(rightNumber).Find("answerItemRight").GetComponent(); rightImg.DOFade(1.0f,0.3f).SetLoops(6,LoopType.Yoyo).OnComplete(() => { + bool result = answerContain.GetChild(rightNumber).GetComponent().isOn; _TriAble = true; - configBtnEvent?.Invoke(); + configBtnEvent?.Invoke(result); GameObject.Destroy(alertGeo); }); }); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index c28cd31..e75cf75 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 54886 + controlID: 3536 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 539 - width: 773 - height: 452 + y: 302 + width: 1182 + height: 689 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -68,7 +68,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} + m_TargetSize: {x: 3840, y: 2160} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -77,16 +77,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 + m_HBaseRangeMin: -1920 + m_HBaseRangeMax: 1920 + m_VBaseRangeMin: -1080 + m_VBaseRangeMax: 1080 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 773 - height: 431 - m_Scale: {x: 0.39907408, y: 0.39907408} - m_Translation: {x: 386.5, y: 215.5} + width: 1182 + height: 668 + m_Scale: {x: 0.3078125, y: 0.3078125} + m_Translation: {x: 590.99994, y: 333.99997} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -968.4919 - y: -540 - width: 1936.9838 - height: 1080 + x: -1919.9998 + y: -1085.076 + width: 3839.9998 + height: 2170.152 m_MinimalGUI: 1 - m_defaultScale: 0.39907408 - m_LastWindowPixelSize: {x: 773, y: 452} + m_defaultScale: 0.3078125 + m_LastWindowPixelSize: {x: 1182, y: 689} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 774 + width: 1183 height: 939 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 54887 + controlID: 3537 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,10 +168,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 774 - height: 466 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 1183 + height: 229 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -201,8 +201,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 773 - height: 445 + width: 1182 + height: 208 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -639,9 +639,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.557845, y: -2.1184287, z: 2.045733} + m_Target: {x: -0.37670505, y: -2.3844569, z: 2.2497458} speed: 2 - m_Value: {x: 2.557845, y: -2.1184287, z: 2.045733} + m_Value: {x: -0.37670505, y: -2.3844569, z: 2.2497458} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -687,13 +687,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.064648174, y: 0.7210983, z: -0.067909196, w: 0.6864614} + m_Target: {x: -0.16660939, y: 0.10244136, z: -0.017406387, w: -0.9805332} speed: 2 - m_Value: {x: 0.064648084, y: 0.7210973, z: -0.0679091, w: 0.68646044} + m_Value: {x: -0.16660929, y: 0.1024413, z: -0.017406376, w: -0.9805326} m_Size: - m_Target: 0.32125324 + m_Target: 0.94379973 speed: 2 - m_Value: 0.32125324 + m_Value: 0.94379973 m_Ortho: m_Target: 0 speed: 2 @@ -711,7 +711,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.30122638, y: -0.102158114, z: 0.032477316, w: -0.9475087} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -807,11 +807,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 466 - width: 774 - height: 473 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + y: 229 + width: 1183 + height: 710 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -841,7 +841,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 539 - width: 773 + width: 993 height: 452 m_SerializedDataModeController: m_DataMode: 0 @@ -877,9 +877,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 774 + x: 1183 y: 0 - width: 610 + width: 127 height: 939 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -909,9 +909,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 774 + x: 1183 y: 73 - width: 608 + width: 125 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -926,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9af80000 - m_LastClickedID: 0 - m_ExpandedIDs: 64b0effffc11f0ff7412f0ff7812f0ff8c12f0ff9012f0ff9412f0ff9812f0ff0813f0ff0c13f0ff1013f0ff3c13f0ff4013f0ffca2ef1ffcc2ef1ffd62ef1ffd82ef1ffda2ef1ffdc2ef1ff482ff1ff4a2ff1ff4e2ff1ff7a2ff1ff7e2ff1ff964ff1ff1a57f1ffc4c2f1ffe037f2ff7050f2fffc50f2ff5aa4f2ff20c4f2ff24c4f2ff40c6f2ff44c6f2ff48c6f2ffb8c6f2ffbcc6f2fff4c6f2ff88c7f2ff14c8f2ff18ddf2ffda16f3ffa21bf3ff4a78f3ff4e78f3ff5278f3ff088cf3ff1ca1f3ffe0f4f3ffe4f4f3ffe8f4f3ffecf4f3ff2e01f4ff3001f4ff3201f4ff3601f4fffe05f4ff8671f4ff60d6f4ffd2d9f4ffd6d9f4ffdcd9f4ffb2ecf4ffb6ecf4ffbaecf4ffbeecf4ffe406f5ffc06af5ff4e74f5ff96bdf5ffa0bdf5ff8616f6ff867bf6ffea83f6ffd8e0f6fffae5f6ff5240f7ff009ff7ffde0af8ffc09ffafff8a0fafffca0faff00a1faff5aa1faff02a3faff06a3faff1aa3faff1ea3faff22a3faff26a3faff96a3faff9aa3faff9ea3faffcea3faff68a4faff70a4faff86a5faffcaa5faffcea5faffccf6faffd0f6faff44f9faff4cfbfaffd88cfcffdc8cfcffd08ffcffee8ffcff7e90fcff5891fcffded4fcffe2d4fcff3cd5fcff3ed5fcff48d5fcff4ad5fcff4cd5fcff4ed5fcffbad5fcffbcd5fcffecd5fcffc2edfcffc6edfcffe801fdff6a13fdff7213fdffba13fdfff214fdfff614fdff4417fdff4817fdff4e17fdffa023fdffd68afdff36a9fdff5aebfdff8648feff6651feffd097feff2098feffe6b3fffff8b3ffff42b4ffff2efbffff187c00000c7f0000a8820000308600001e8800002c8c000058600100b46301004e670100ca6a01005881010004830100ae84010048880100c48b0100d6d30100a0d40100ecda0100d8dc010004e00100e6e0010004690200686f020040700200489e0200aca4020084a5020070e702000eee020018f1020036f1020072f402004af5020036f7020044fb0200c4fe0200d43d0300324403000a450300ea5303003c580300565b0300605b03009a5e0300725f0300cebe0300d4be030020c303002ac603007ec9030056ca030020d903006cdd0300a2e4030042280400ba2c0400c42f040018330400f033040028470400324a0400864d04005e4e0400e6b0040046b704001eb8040022cd04005cd3040038d40400 + m_SelectedIDs: 7e96fbff + m_LastClickedID: -289154 + m_ExpandedIDs: f299fbffcee2fcff28c7fdff94ccfdff1eeafeff7e75ffff2efbfffff4ffffff30780000507800002c10010036110100d6110100f2180100b6260100d6260100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -967,9 +967,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1384 + x: 1310 y: 0 - width: 202 + width: 255 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -999,9 +999,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1384 - y: 73 - width: 200 + x: 1311 + y: 19 + width: 253 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/_Scenes + - Assets/StreamingAssets/Excel m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1041,7 +1041,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 5e780000 m_LastClickedID: 30814 - m_ExpandedIDs: ffffffff0000000060940000c094000080970000c6970000fef4000000f5000002f5000004f5000006f5000008f500000af500000cf500000ef5000010f5000012f5000014f5000016f5000018f500001af500001cf500001ef5000020f5000022f5000024f5000026f5000028f500002af500002cf500002ef5000030f5000032f5000036f5000038f500003af5000040f500009ef8000014f90000407c0200427c0200d41b0300 + m_ExpandedIDs: ffffffff00000000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000ca780000cc780000ce780000d6780000d8780000da780000e0780000e2780000e47800002c7c0000347c0000d68b0000d625010018260100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1066,10 +1066,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9af80000 - m_LastClickedID: 63642 - m_ExpandedIDs: ffffffff0000000060940000c094000080970000c6970000fef4000000f5000002f5000004f5000006f5000008f500000af500000cf500000ef5000010f5000012f5000014f5000016f5000018f500001af500001cf500001ef5000020f5000022f5000024f5000026f5000028f500002af500002cf500002ef5000030f5000032f5000036f5000038f500003af5000040f500009ef80000a6f80000a8f8000014f90000407c0200427c0200d41b03004ee00400 + scrollPos: {x: 0, y: 56} + m_SelectedIDs: 7e96fbff + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff00000000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000ca780000cc780000ce780000d6780000d8780000da780000e0780000e2780000e4780000e47b00002c7c0000347c0000d68b0000d625010018260100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1094,8 +1094,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9af80000 - m_LastClickedInstanceID: 63642 + m_SelectedInstanceIDs: 7e96fbff + m_LastClickedInstanceID: -289154 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1140,9 +1140,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1586 + x: 1565 y: 0 - width: 334 + width: 355 height: 939 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -1172,9 +1172,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1586 - y: 73 - width: 333 + x: 1566 + y: 19 + width: 354 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1189,7 +1189,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 277 + m_CachedPref: 459 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1