修改冲胚动画

修改镜头角度
修改精子活率检查时弹窗关闭时间

Assets/StreamingAssets/ExcelJson/NiuData.txt

@@ -584,7 +584,7 @@
     "SoundPath": "",
     "VideoPath": "",
     "TimelineLength": 300,
-    "CameraDefaultTR": "-1.980654_-2.169447_2.158473|11.24501_48.06995_0",
+    "CameraDefaultTR": "-1.543189_-2.169447_1.796093|10.40001_34.54999_0",
     "CameraNearTR": "-0.4457303_-2.169447_2.664017|16.575_343.525_0",
     "CameraNearTR2": "",
     "QNextNum": 0,
@@ -662,7 +662,7 @@
     "SoundPath": "",
     "VideoPath": "",
     "TimelineLength": 300,
-    "CameraDefaultTR": "-1.980654_-2.169447_2.158473|11.24501_48.06995_0",
+    "CameraDefaultTR": "-1.543189_-2.169447_1.796093|10.40001_34.54999_0",
     "CameraNearTR": "-0.4457303_-2.169447_2.664017|16.575_343.525_0",
     "CameraNearTR2": "",
     "QNextNum": 0,
@@ -766,7 +766,7 @@
     "SoundPath": "",
     "VideoPath": "",
     "TimelineLength": 300,
-    "CameraDefaultTR": "-1.980654_-2.169447_2.158473|11.24501_48.06995_0",
+    "CameraDefaultTR": "-1.543189_-2.169447_1.796093|10.40001_34.54999_0",
     "CameraNearTR": "-0.4457303_-2.169447_2.664017|16.575_343.525_0",
     "CameraNearTR2": "",
     "QNextNum": 0,

Assets/TimeLine/CPTimeLineCtrl.playable

@@ -2119,7 +2119,7 @@ MonoBehaviour:
     m_Start: 23.41666666666667
     m_ClipIn: 0
     m_Asset: {fileID: 477148568887690605}
-    m_Duration: 82.79166666666667
+    m_Duration: 82.85
     m_TimeScale: 1
     m_ParentTrack: {fileID: -2297396266180361562}
     m_EaseInDuration: 0

Assets/_Scripts/Application/UI/ThreeVideoChoicePrefab.cs

@@ -64,12 +64,18 @@ namespace ZXK.LouDiXvMuNiu
                     _videoItemContainer.GetChild(1).GetComponent<Toggle>().isOn = false;
                     _videoItemContainer.GetChild(2).GetComponent<Toggle>().isOn = false;
                 }
-                
+                if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
+                {
                     Image rightImg = _videoItemContainer.GetChild(rightNumber).Find("Selected").GetComponent<Image>();
-                rightImg.DOFade(1.0f,1.0f).SetLoops(6, LoopType.Yoyo).OnComplete(() =>
+                    rightImg.DOFade(1.0f, 0.2f).SetLoops(6, LoopType.Yoyo).OnComplete(() =>
                      {
                          configBtnEvent?.Invoke();
                      });
+                }
+                else
+                {
+                    configBtnEvent?.Invoke();
+                }
             });
             transform.SetAsLastSibling();
         }

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 349
+  controlID: 8542
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -150,7 +150,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 350
+  controlID: 8543
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -633,14 +633,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 157.77075, y: 638.05493, z: -8.823873}
+    m_Target: {x: 1.4269366, y: -2.0606198, z: 1.9966705}
     speed: 2
-    m_Value: {x: 157.77075, y: 638.05493, z: -8.823873}
+    m_Value: {x: 1.4269366, y: -2.0606198, z: 1.9966705}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -668,17 +668,17 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -686,17 +686,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.22089653, y: 0.21218473, z: -0.04930329, w: -0.95066065}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.22089608, y: 0.2121843, z: -0.04930319, w: -0.95065874}
   m_Size:
-    m_Target: 853.32935
+    m_Target: 0.22640947
     speed: 2
-    m_Value: 853.32935
+    m_Value: 0.22640947
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -710,7 +710,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0.42765638, y: -0.001355869, z: 0.00064189476, w: 0.90394235}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -852,9 +852,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: bc62fbff
+      m_SelectedIDs: a67a0000
-      m_LastClickedID: -302404
+      m_LastClickedID: 0
-      m_ExpandedIDs: 2066fbffb8d1fbff5017fdff6e32fdff7232fdfffa59fdff125afdff1a5afdff366dfdff44c6fdfff21bfeffb066feff10b5feff2efbfffff4ffffffb2b70100bcb8010032bc0100a2c20100cac20100a8ee0100c8ee0100
+      m_ExpandedIDs: 9010f9ff0457f9ffde57f9ff549ff9ffaec7f9ffd6c8f9ff5aeef9ff98f8f9ff58f9f9ff7a42faff9c42faff2e9efaff9abdfaffbcbefaff7acffaff7ecffaff8ed0faff42f9faff2066fbffb8d1fbff5017fdff6e32fdff7232fdfffa59fdff125afdff1a5afdff366dfdff44c6fdfff21bfeffb066feff10b5feff2efbfffff4ffffffb2b70100bcb8010032bc0100a2c20100cac20100a8ee0100c8ee0100a08a0200e68a0200fa8c020068900200d8960200cc980200b01c0300aa200300562603001a270300
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -949,7 +949,8 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders: []
+    m_Folders:
+    - Assets/_Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -965,7 +966,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: be940b00
     m_LastClickedID: 758974
-    m_ExpandedIDs: ffffffff00000000e0770000e4770000ea770000ec770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c780000
+    m_ExpandedIDs: ffffffff00000000e0770000e4770000ea770000ec770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c780000527b0000b0b501000ccf010046cf0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -991,9 +992,9 @@ MonoBehaviour:
       m_ResourceFile: 
   m_AssetTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: bc62fbff
+    m_SelectedIDs: a67a0000
-    m_LastClickedID: 0
+    m_LastClickedID: 31398
-    m_ExpandedIDs: ffffffff00000000e0770000e4770000ea770000ec770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c780000527b0000b0b501000ccf010046cf0100
+    m_ExpandedIDs: ffffffff00000000e0770000e2770000e4770000e8770000ea770000ec770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c780000b0b501000ccf010046cf0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1018,8 +1019,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: bc62fbff
+    m_SelectedInstanceIDs: a67a0000
-    m_LastClickedInstanceID: -302404
+    m_LastClickedInstanceID: 31398
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
@@ -1068,8 +1069,8 @@ MonoBehaviour:
     y: 0
     width: 288
     height: 939
-  m_MinSize: {x: 276, y: 71}
+  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}