diff --git a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat index 1674159..9cdfb91 100644 --- a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat +++ b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat @@ -127,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.42352942, g: 0.7019608, b: 0.6784314, a: 0.25} - - _Color: {r: 0.42352942, g: 0.7019608, b: 0.6784314, a: 0.25} + - _Color: {r: 0.4235294, g: 0.7019608, b: 0.6784314, a: 0.25} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat b/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat index 2211dff..42b5a51 100644 --- a/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat +++ b/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat @@ -118,7 +118,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8113208, g: 0.21813813, b: 0.22139741, a: 1} - - _Color: {r: 0.8113208, g: 0.21813813, b: 0.22139741, a: 1} + - _Color: {r: 0.8113207, g: 0.21813807, b: 0.22139737, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_yisheng_jingtai/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat b/Assets/Art/Models/LouDi/SM_yisheng_jingtai/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat index df887b9..19e76ae 100644 --- a/Assets/Art/Models/LouDi/SM_yisheng_jingtai/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat +++ b/Assets/Art/Models/LouDi/SM_yisheng_jingtai/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.028469002, g: 0.15428142, b: 0.343, a: 1} - - _Color: {r: 0.028469002, g: 0.15428142, b: 0.343, a: 1} + - _Color: {r: 0.028469002, g: 0.15428138, b: 0.34299996, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/样本1.mp4 b/Assets/Art/YB1.mp4 similarity index 100% rename from Assets/Art/样本1.mp4 rename to Assets/Art/YB1.mp4 diff --git a/Assets/Art/样本1.mp4.meta b/Assets/Art/YB1.mp4.meta similarity index 100% rename from Assets/Art/样本1.mp4.meta rename to Assets/Art/YB1.mp4.meta diff --git a/Assets/Art/样本2.mp4 b/Assets/Art/YB2.mp4 similarity index 100% rename from Assets/Art/样本2.mp4 rename to Assets/Art/YB2.mp4 diff --git a/Assets/Art/样本2.mp4.meta b/Assets/Art/YB2.mp4.meta similarity index 100% rename from Assets/Art/样本2.mp4.meta rename to Assets/Art/YB2.mp4.meta diff --git a/Assets/Art/样本3.mp4 b/Assets/Art/YB3.mp4 similarity index 100% rename from Assets/Art/样本3.mp4 rename to Assets/Art/YB3.mp4 diff --git a/Assets/Art/样本3.mp4.meta b/Assets/Art/YB3.mp4.meta similarity index 100% rename from Assets/Art/样本3.mp4.meta rename to Assets/Art/YB3.mp4.meta diff --git a/Assets/Art/胚胎选择（显微镜下）.mp4 b/Assets/Art/ptxz.mp4 similarity index 100% rename from Assets/Art/胚胎选择（显微镜下）.mp4 rename to Assets/Art/ptxz.mp4 diff --git a/Assets/Art/胚胎选择（显微镜下）.mp4.meta b/Assets/Art/ptxz.mp4.meta similarity index 100% rename from Assets/Art/胚胎选择（显微镜下）.mp4.meta rename to Assets/Art/ptxz.mp4.meta diff --git a/Assets/StreamingAssets/AVProVideo/母牛发情鉴定_直肠检查法_卵巢的呈现.mp4 b/Assets/StreamingAssets/AVProVideo/MNFQ.mp4 similarity index 100% rename from Assets/StreamingAssets/AVProVideo/母牛发情鉴定_直肠检查法_卵巢的呈现.mp4 rename to Assets/StreamingAssets/AVProVideo/MNFQ.mp4 diff --git a/Assets/StreamingAssets/AVProVideo/母牛发情鉴定_直肠检查法_卵巢的呈现.mp4.meta b/Assets/StreamingAssets/AVProVideo/MNFQ.mp4.meta similarity index 100% rename from Assets/StreamingAssets/AVProVideo/母牛发情鉴定_直肠检查法_卵巢的呈现.mp4.meta rename to Assets/StreamingAssets/AVProVideo/MNFQ.mp4.meta diff --git a/Assets/StreamingAssets/AVProVideo/样本1.mp4 b/Assets/StreamingAssets/AVProVideo/YB1.mp4 similarity index 100% rename from Assets/StreamingAssets/AVProVideo/样本1.mp4 rename to Assets/StreamingAssets/AVProVideo/YB1.mp4 diff --git a/Assets/StreamingAssets/AVProVideo/样本1.mp4.meta b/Assets/StreamingAssets/AVProVideo/YB1.mp4.meta similarity index 100% rename from Assets/StreamingAssets/AVProVideo/样本1.mp4.meta rename to Assets/StreamingAssets/AVProVideo/YB1.mp4.meta diff --git a/Assets/StreamingAssets/AVProVideo/样本2.mp4 b/Assets/StreamingAssets/AVProVideo/YB2.mp4 similarity index 100% rename from Assets/StreamingAssets/AVProVideo/样本2.mp4 rename to Assets/StreamingAssets/AVProVideo/YB2.mp4 diff --git a/Assets/StreamingAssets/AVProVideo/样本2.mp4.meta b/Assets/StreamingAssets/AVProVideo/YB2.mp4.meta similarity index 100% rename from Assets/StreamingAssets/AVProVideo/样本2.mp4.meta rename to Assets/StreamingAssets/AVProVideo/YB2.mp4.meta diff --git a/Assets/StreamingAssets/AVProVideo/样本3.mp4 b/Assets/StreamingAssets/AVProVideo/YB3.mp4 similarity index 100% rename from Assets/StreamingAssets/AVProVideo/样本3.mp4 rename to Assets/StreamingAssets/AVProVideo/YB3.mp4 diff --git a/Assets/StreamingAssets/AVProVideo/样本3.mp4.meta b/Assets/StreamingAssets/AVProVideo/YB3.mp4.meta similarity index 100% rename from Assets/StreamingAssets/AVProVideo/样本3.mp4.meta rename to Assets/StreamingAssets/AVProVideo/YB3.mp4.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/采用CIDR和FSH联合超排.mp3 b/Assets/StreamingAssets/Audios/NiuTips/CIDR.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/采用CIDR和FSH联合超排.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/CIDR.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/采用CIDR和FSH联合超排.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/CIDR.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/采用CIDR和FSH联合超排.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/CIDR.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/超声波检测法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/CSB.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/超声波检测法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/CSB.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/超声波检测法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/CSB.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/超声波检测法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/CSB.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/采用FSH+PVP+PGF2α联合用药法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/CYFSH.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/采用FSH+PVP+PGF2α联合用药法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/CYFSH.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/采用FSH+PVP+PGF2α联合用药法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/CYFSH.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/采用FSH+PVP+PGF2α联合用药法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/CYFSH.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/二次前列腺素法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/ECQL.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/二次前列腺素法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/ECQL.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/二次前列腺素法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/ECQL.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/二次前列腺素法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/ECQL.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/发情判断.mp3 b/Assets/StreamingAssets/Audios/NiuTips/FQPD.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/发情判断.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/FQPD.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/发情判断.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/FQPD.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/发情判断.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/FQPD.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/使用FSH进行超排.mp3 b/Assets/StreamingAssets/Audios/NiuTips/FSH.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/使用FSH进行超排.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/FSH.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/使用FSH进行超排.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/FSH.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/使用FSH进行超排.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/FSH.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/非手术移植.mp3 b/Assets/StreamingAssets/Audios/NiuTips/FSS.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/非手术移植.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/FSS.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/非手术移植.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/FSS.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/非手术移植.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/FSS.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/使用PMSG进行超排.mp3 b/Assets/StreamingAssets/Audios/NiuTips/PMSG.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/使用PMSG进行超排.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/PMSG.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/使用PMSG进行超排.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/PMSG.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/使用PMSG进行超排.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/PMSG.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/前列腺素法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/QLX.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/前列腺素法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/QLX.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/前列腺素法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/QLX.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/前列腺素法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/QLX.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/阴道检查法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/YDJC.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/阴道检查法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/YDJC.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/阴道检查法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/YDJC.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/阴道检查法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/YDJC.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/孕激素法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/YJS.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/孕激素法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/YJS.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/孕激素法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/YJS.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/孕激素法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/YJS.mp3.meta diff --git a/Assets/StreamingAssets/Audios/NiuTips/直肠检查法.mp3 b/Assets/StreamingAssets/Audios/NiuTips/ZCJC.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/直肠检查法.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/ZCJC.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/直肠检查法.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/ZCJC.mp3.meta similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/直肠检查法.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/ZCJC.mp3.meta diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 46115ac..502f8e2 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 45d8e29..bf4bedf 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -972,7 +972,7 @@ "Operation": "点击卵巢后，旁边弹出视频弹窗，播放《母牛发情鉴定_直肠检查法_卵巢的呈现.mp4》\n\n播放完，自动关闭。点击弹窗关闭按钮，同样关闭该弹窗", "ProcessDescription": "", "SoundPath": "", - "VideoPath": "母牛发情鉴定_直肠检查法_卵巢的呈现", + "VideoPath": "MNFQ", "TimelineLength": 0, "CameraDefaultTR": "1.53373_-2.362435_-0.4670869|4.095002_0.8450013_0", "CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index 101bac6..375fcda 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -301,6 +301,7 @@ namespace ZXK.LouDiXvMuNiu ClickToolCallInTrainState(rayHit.transform.gameObject, () => { GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), CG.Framework.UIGroup.Tip); + Debug.Log("ǰƵ" + _CurSceneStep.VideoPath + "ǰƵ"); videoGeo.GetComponent().PlayVideoClip(_CurSceneStep.VideoPath, () => { UI_Manage.Instance.HidePanel("ShowToastUIPrefab"); diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index ee8c437..f1afe53 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -293,7 +293,55 @@ namespace ZXK.LouDiXvMuNiu ||obj.ModuleName.Equals(ConstCtrl.ModuleName_YYZD))) { GameObject showTitleUIGeo = UI_Manage.Instance.ShowPanel("ShowTitleUIPrefab", Type.GetType("ZXK.LouDiXvMuNiu.ShowTitleUIPrefab"), UIGroup.Tip); - showTitleUIGeo.GetComponent().SetTextAudMsg(obj.ThreeTaskName, obj.ThreeTaskName, () => + + Debug.Log("Ƶ·" + "obj.ThreeTaskName"+ obj.ThreeTaskName); + string audioName = ""; + switch (obj.ThreeTaskName) + { + case "ǰط": + audioName = "ECQL"; + break; + case "ʹFSHг": + audioName = "FSH"; + break; + case "ʹPMSGг": + audioName = "PMSG"; + break; + case "ǰط": + audioName = "QLX"; + break; + case "ж": + audioName = "FQPD"; + break; + case "мط": + audioName = "YJS"; + break; + case "ֱ鷨": + audioName = "ZCJC"; + break; + + case "ⷨ": + audioName = "CSB"; + break; + + case "CIDRFSHϳ": + audioName = "CIDR"; + break; + + case "FSH+PVP+PGF2ҩ": + audioName = "CYFSH"; + break; + + case "鷨": + audioName = "YDJC"; + break; + case "ֲ": + audioName = "FSS"; + + break; + } + + showTitleUIGeo.GetComponent().SetTextAudMsg(obj.ThreeTaskName, audioName, () => { UpdateTaskType(obj); WordTip(obj); @@ -469,6 +517,7 @@ namespace ZXK.LouDiXvMuNiu else if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState")) { GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip); + Debug.Log("?????????????"+ obj.VideoPath+"????????????????"); videoGeo.GetComponent().PlayVideoClip(obj.VideoPath, () => { UI_Manage.Instance.HidePanel("ShowToastUIPrefab"); @@ -479,6 +528,7 @@ namespace ZXK.LouDiXvMuNiu if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_VideoAuto)) { GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowNoCtrlPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip); + Debug.Log("!!!!!!!!!!!!!!!" + obj.VideoPath + "!!!!!!!!!!!!!!!"); videoGeo.GetComponent().PlayVideoClip(obj.VideoPath, () => { UI_Manage.Instance.HidePanel("ShowToastUIPrefab"); diff --git a/Assets/_Scripts/Application/UI/VideoShowPanel.cs b/Assets/_Scripts/Application/UI/VideoShowPanel.cs index 45d5940..d242407 100644 --- a/Assets/_Scripts/Application/UI/VideoShowPanel.cs +++ b/Assets/_Scripts/Application/UI/VideoShowPanel.cs @@ -27,7 +27,7 @@ namespace ZXK.LouDiXvMuNiu public void PlayVideoClip(string clipName,Action exitEvent) { _exitEvent = exitEvent; - + string _videoPath = Application.streamingAssetsPath + ConstCtrl.VIDEO_CSDY_PATH+clipName+".mp4"; _videoCtrl.GetComponent().OnOpenVideoFile(_videoPath); _videoCtrl.GetComponent().SetFinishAction(FinishAction); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9b3d789..1e8fc46 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -15,8 +15,8 @@ MonoBehaviour: m_Children: - {fileID: 3} - {fileID: 8} - - {fileID: 10} - - {fileID: 12} + - {fileID: 11} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 454 + controlID: 8713 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 594 - width: 642 - height: 405 + y: 287 + width: 753 + height: 712 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -104,10 +104,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 642 - height: 384 - m_Scale: {x: 0.334375, y: 0.334375} - m_Translation: {x: 321, y: 192} + width: 753 + height: 691 + m_Scale: {x: 0.3921875, y: 0.3921875} + m_Translation: {x: 376.5, y: 345.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -115,12 +115,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -574.2056 + y: -880.9562 width: 1920 - height: 1148.4113 + height: 1761.9124 m_MinimalGUI: 1 - m_defaultScale: 0.334375 - m_LastWindowPixelSize: {x: 642, y: 405} + m_defaultScale: 0.3921875 + m_LastWindowPixelSize: {x: 753, y: 712} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 643 + width: 754 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 455 + controlID: 8714 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,8 +168,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 643 - height: 521 + width: 754 + height: 214 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} @@ -201,8 +201,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 642 - height: 500 + width: 753 + height: 193 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -561,9 +561,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 897.2803, y: 440.17807, z: 7.7022223} + m_Target: {x: 1439, y: 307, z: 0} speed: 2 - m_Value: {x: 897.2803, y: 440.17807, z: 7.7022223} + m_Value: {x: 1439, y: 307, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -613,9 +613,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 416.1271 + m_Target: 312.9015 speed: 2 - m_Value: 416.1271 + m_Value: 312.9015 m_Ortho: m_Target: 1 speed: 2 @@ -729,9 +729,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 521 - width: 643 - height: 426 + y: 214 + width: 754 + height: 733 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} @@ -749,22 +749,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneHierarchyWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 643 + x: 754 y: 0 - width: 576 + width: 564 height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 9} m_Panes: - {fileID: 9} + - {fileID: 10} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -786,9 +787,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 643 + x: 754 y: 73 - width: 574 + width: 562 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -803,9 +804,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 927f0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2efbffff + m_ExpandedIDs: fe12d2ffe0ebd2ff5a2bd4ff8e64d4ff9464d4fff296d4fff866d6ffd896dfffdab8dfff5220edff2c21edff6081edffa681edff0c44f7ff46adf7fffec6f7ff02c7f7ff2efbfffff4ffffff007b00001c7b0000227b0000367b00003c7b0000467b0000906d0100b86d010092750100e47501003a420200564202005c420200704202007642020080420200924c0300dc4c0300c05303006c540300be540300c4600300b46703008a740300527d0300541304002e1b0400801b040058310400083f0400 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -830,6 +831,41 @@ MonoBehaviour: m_CurrentSortingName: TransformSorting m_WindowGUID: a6e2553f72bbb254f9d23b9eed1f9ebf --- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 754 + y: 73 + width: 562 + height: 926 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -844,18 +880,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1219 + x: 1318 y: 0 - width: 337 + width: 238 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 11} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -876,9 +912,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1219 + x: 1318 y: 73 - width: 335 + width: 236 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -901,7 +937,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/StreamingAssets/Excel + - Assets/_Scripts/Application/States m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -917,7 +953,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 10690000 m_LastClickedID: 26896 - m_ExpandedIDs: ffffffff000000009a7b00009c7b00009e7b0000a07b0000a27b0000a47b0000a67b0000a87b0000aa7b0000ac7b0000ae7b0000b07b0000b27b0000b47b0000b67b0000b87b0000ba7b0000bc7b0000c07b0000c27b0000c47b0000c67b0000c87b0000ca7b0000cc7b0000ce7b0000d07b0000d27b0000d47b0000d67b0000d87b0000da7b0000dc7b0000de7b0000e07b0000e27b0000e47b0000e67b0000 + m_ExpandedIDs: ffffffff000000009a7b00009c7b00009e7b0000a07b0000a27b0000a47b0000a67b0000a87b0000aa7b0000ac7b0000ae7b0000b07b0000b27b0000b47b0000b67b0000b87b0000ba7b0000bc7b0000be7b0000c07b0000c27b0000c47b0000c67b0000c87b0000ca7b0000cc7b0000ce7b0000d07b0000d27b0000d47b0000d67b0000d87b0000da7b0000dc7b0000de7b0000e07b0000e27b0000e47b0000ee7e0000f07e0000087f0000f4490100fa490100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -942,10 +978,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 927f0000 - m_LastClickedID: 32658 - m_ExpandedIDs: ffffffff000000009a7b00009c7b00009e7b0000a07b0000a27b0000a47b0000a67b0000a87b0000aa7b0000ac7b0000ae7b0000b07b0000b27b0000b47b0000b67b0000b87b0000ba7b0000bc7b0000c07b0000c27b0000c47b0000c67b0000c87b0000ca7b0000cc7b0000ce7b0000d07b0000d27b0000d47b0000d67b0000d87b0000da7b0000dc7b0000de7b0000e07b0000e27b0000e47b0000e67b0000 + scrollPos: {x: 0, y: 564} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff000000009a7b00009c7b00009e7b0000a07b0000a27b0000a47b0000a67b0000a87b0000aa7b0000ac7b0000ae7b0000b07b0000b27b0000b47b0000b67b0000b87b0000ba7b0000bc7b0000be7b0000c07b0000c27b0000c47b0000c67b0000c87b0000ca7b0000cc7b0000ce7b0000d07b0000d27b0000d47b0000d67b0000d87b0000da7b0000dc7b0000de7b0000e07b0000e27b0000e47b0000ee7e0000f07e0000007f0000087f0000f4490100fa490100fc490100fe49010024280400 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -961,7 +997,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -970,26 +1006,26 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 927f0000 - m_LastClickedInstanceID: 32658 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: f46c0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: NiuSceneMng + m_OriginalName: NiuSceneMng m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 3096 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1001,7 +1037,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 50 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1022,12 +1058,12 @@ MonoBehaviour: height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1065,7 +1101,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -286.99997 + m_CachedPref: 191 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1