提交修改内容

Merge remote-tracking branch 'origin/master' into AnHui_BaoShi
修改UI关闭通知延迟0.1秒发送
2025-03-18 11:08:17 +08:00 · 2025-03-18 10:36:13 +08:00 · 2025-03-14 17:10:45 +08:00 · 2025-03-14 14:18:59 +08:00
14 changed files with 3952 additions and 524 deletions
--- a/Assets/Draw/Scripts/ScreenShotPainter.cs
+++ b/Assets/Draw/Scripts/ScreenShotPainter.cs
@ -472,12 +472,10 @@ public class ScreenShotPainter : MonoBehaviour

    void OnPostRender()
    {
-        Debug.LogError(" OnPostRender");
        if (!enabled)
            return;
        if (_drawRegionRect)
        {
-            Debug.LogError("111");
            //如果材质球不存在
            if (!_lineMaterial)
            {
@ -548,10 +546,6 @@ public class ScreenShotPainter : MonoBehaviour
            _drawRegionRect = false;
            float width = _rightUpConnerPoint.x - _leftDownConnerPoint.x;
            float height = _rightUpConnerPoint.y - _leftDownConnerPoint.y;
-            Debug.LogError(_leftDownConnerPoint.x.ToString("0.00"));
-            Debug.LogError(_leftDownConnerPoint.y.ToString("0.00"));
-            Debug.LogError("width:" + width);
-            Debug.LogError("width:" + height);
            Rect rect = new Rect(_leftDownConnerPoint.x, Screen.height - _leftUpConnerPoint.y, width, height);


@ -619,6 +613,13 @@ public class ScreenShotPainter : MonoBehaviour



+
+    public void SetStatus(Status status)
+    {
+        this.status = status;
+        ChangeToEraser(this.status == Status.Eraser);
+    }
+
    private void OnPaintBeginDrag(BaseEventData arg0)
    {
        if (_enabled && _haveRegion)
@ -658,13 +659,6 @@ public class ScreenShotPainter : MonoBehaviour
            }
        }
    }
-
-    public void SetStatus(Status status)
-    {
-        this.status = status;
-        ChangeToEraser(this.status == Status.Eraser);
-    }
-
    private void PaintDragging(BaseEventData data)
    {
        if (_enabled && _haveRegion)
@ -698,53 +692,6 @@ public class ScreenShotPainter : MonoBehaviour
            }
        }
    }
-    bool isRect = false;
-    private void OnGUI()
-    {
-        if (isRect)
-        {
-            var points = GenerateRectanglePoints(_lastPoint, Input.mousePosition);
-
-
-            float minX = float.MaxValue;
-            float minY = float.MaxValue;
-            float maxX = float.MinValue;
-            float maxY = float.MinValue;
-
-            // 找出最小和最大的 x、y 坐标
-            foreach (Vector2 point in points)
-            {
-                if (point.x < minX)
-                {
-                    minX = point.x;
-                }
-                if (point.x > maxX)
-                {
-                    maxX = point.x;
-                }
-                if (point.y < minY)
-                {
-                    minY = point.y;
-                }
-                if (point.y > maxY)
-                {
-                    maxY = point.y;
-                }
-            }
-
-            float x = minX;
-            float y = maxY;
-            float width = maxX - minX;
-            float height = maxY - minY;
-
-            Rect rect = new Rect(x, y, width, height);
-
-            GUI.backgroundColor = Color.blue;
-            GUI.color = Color.yellow;
-            GUI.Box(rect, "我帮你绘制了个 Rect Box");
-        }
-    }
-
    private void OnPaintEndDrag(BaseEventData data)
    {
        if (_enabled && _haveRegion)
@ -796,6 +743,69 @@ public class ScreenShotPainter : MonoBehaviour
            }
        }
    }
+    public void FinishedRaw()
+    {
+        if (_currentLine != null)
+        {
+            // 保存当前纹理到 LineSegment
+            RenderTexture.active = _currentLine.Texture;
+            Graphics.Blit(_currentRenderTexture, _currentLine.Texture);
+            RenderTexture.active = null;
+
+            _lineStack.Push(_currentLine);
+            _currentLine = null;
+        }
+
+        _lastPoint = Vector2.zero;
+
+    }
+    bool isRect = false;
+    private void OnGUI()
+    {
+        if (isRect)
+        {
+            var points = GenerateRectanglePoints(_lastPoint, Input.mousePosition);
+
+
+            float minX = float.MaxValue;
+            float minY = float.MaxValue;
+            float maxX = float.MinValue;
+            float maxY = float.MinValue;
+
+            // 找出最小和最大的 x、y 坐标
+            foreach (Vector2 point in points)
+            {
+                if (point.x < minX)
+                {
+                    minX = point.x;
+                }
+                if (point.x > maxX)
+                {
+                    maxX = point.x;
+                }
+                if (point.y < minY)
+                {
+                    minY = point.y;
+                }
+                if (point.y > maxY)
+                {
+                    maxY = point.y;
+                }
+            }
+
+            float x = minX;
+            float y = maxY;
+            float width = maxX - minX;
+            float height = maxY - minY;
+
+            Rect rect = new Rect(x, y, width, height);
+
+            GUI.backgroundColor = Color.blue;
+            GUI.color = Color.yellow;
+            GUI.Box(rect, "我帮你绘制了个 Rect Box");
+        }
+    }
+
    List<Vector2> GenerateCirclePoints(Vector2 center, float r, int numPoints = 36)
    {
        List<Vector2> points = new List<Vector2>();
@ -868,25 +878,18 @@ public class ScreenShotPainter : MonoBehaviour
    }


-    public void FinishedRaw()
+    public void Clear()
    {
-        if (_currentLine != null)
-        {
-            // 保存当前纹理到 LineSegment
-            RenderTexture.active = _currentLine.Texture;
-            Graphics.Blit(_currentRenderTexture, _currentLine.Texture);
-            RenderTexture.active = null;
+        // 重新分配 RenderTexture
+        _currentRenderTexture = RenderTexture.GetTemporary(_screenWidth, _screenHeight, 24);

-            _lineStack.Push(_currentLine);
-            _paintCanvasImg.texture = _currentLine.Texture;
-            _currentLine = null;
+        // 更新画布的纹理
+        _paintCanvasImg.texture = _currentRenderTexture;
+
+        // 清空线条栈
+        _lineStack.Clear();
    }

-        _lastPoint = Vector2.zero;
-
-    }
-
-
    public void Undo()
    {
        if (_lineStack.Count > 0)
@ -898,10 +901,13 @@ public class ScreenShotPainter : MonoBehaviour
            if (_lineStack.Count > 0)
            {
                var previousLine = _lineStack.Peek();
-                RenderTexture.active = _currentRenderTexture;
-                Graphics.Blit(previousLine.Texture, _currentRenderTexture);
-                RenderTexture.active = null;
+                //RenderTexture.active = _currentRenderTexture;
+                //Graphics.Blit(previousLine.Texture, _currentRenderTexture);
+                //RenderTexture.active = null;
+                _currentRenderTexture = previousLine.Texture;
                _paintCanvasImg.texture = previousLine.Texture;
+
+
            }
            else
            {
@ -909,17 +915,7 @@ public class ScreenShotPainter : MonoBehaviour
            }
        }
    }
-    public void Clear()
-    {
-        // 重新分配 RenderTexture
-        _currentRenderTexture = RenderTexture.GetTemporary(_screenWidth, _screenHeight, 24);

-        // 更新画布的纹理
-        _paintCanvasImg.texture = _currentRenderTexture;
-
-        // 清空线条栈
-        _lineStack.Clear();
-    }
    /// <summary>
    /// 绘画进行插值
    /// </summary>
@ -967,7 +963,6 @@ public class ScreenShotPainter : MonoBehaviour
            material = _paintBrushMat;
        }

-
        _commandBuffer.Blit(_currentRenderTexture, _currentRenderTexture, material);

        Graphics.ExecuteCommandBuffer(_commandBuffer);
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/DaoPianQieGeYuShi.playable
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/DaoPianQieGeYuShi.playable
@ -323,6 +323,7 @@ MonoBehaviour:
  - {fileID: -4917080294068643052}
  - {fileID: -2171752716903802248}
  - {fileID: 2417757911992991606}
+  - {fileID: 6698710225290389213}
  m_FixedDuration: 0
  m_EditorSettings:
    m_Framerate: 60
@ -893,6 +894,126 @@ AnimationClip:
    classID: 1
    script: {fileID: 0}
    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi2
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: WanZheng
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi1
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
  m_PPtrCurves: []
  m_SampleRate: 60
  m_WrapMode: 0
@ -946,6 +1067,42 @@ AnimationClip:
      isPPtrCurve: 0
      isIntCurve: 0
      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 4206408590
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3480993618
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1672602164
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3101990154
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
    pptrCurveMapping: []
  m_AnimationClipSettings:
    serializedVersion: 2
@ -1586,6 +1743,126 @@ AnimationClip:
    classID: 4
    script: {fileID: 0}
    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi2
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: WanZheng
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi1
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.0333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
  m_EulerEditorCurves:
  - serializedVersion: 2
    curve:
@ -1626,3 +1903,266 @@ AnimationClip:
  m_HasGenericRootTransform: 1
  m_HasMotionFloatCurves: 0
  m_Events: []
+--- !u!74 &5546762240107264865
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Recorded (2)
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.266667
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi004
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi005
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi003
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1271376284
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1019255050
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3584244799
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 7.266667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 7.266667
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi004
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi005
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi003
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+--- !u!114 &6698710225290389213
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 1
+  m_InfiniteClipPostExtrapolation: 1
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 5546762240107264865}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/YouBiaoKaChiCeLiang.playable
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/YouBiaoKaChiCeLiang.playable
@ -923,6 +923,90 @@ AnimationClip:
    classID: 1
    script: {fileID: 0}
    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi2
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi1
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: WanZheng
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
  m_PPtrCurves: []
  m_SampleRate: 60
  m_WrapMode: 0
@ -958,6 +1042,42 @@ AnimationClip:
      isPPtrCurve: 0
      isIntCurve: 0
      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 4206408590
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3101990154
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1672602164
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3480993618
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
    - serializedVersion: 2
      path: 0
      attribute: 4
@ -1184,6 +1304,90 @@ AnimationClip:
    classID: 1
    script: {fileID: 0}
    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi2
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_BaoShi1
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: WanZheng
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
  m_EulerEditorCurves:
  - serializedVersion: 2
    curve:
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/ZhiChi_CeLiangBaJiaoShou.playable
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/ZhiChi_CeLiangBaJiaoShou.playable
@ -25,7 +25,7 @@ MonoBehaviour:
    m_Start: 0
    m_ClipIn: 0
    m_Asset: {fileID: 8298357912922632321}
-    m_Duration: 4.166666666666667
+    m_Duration: 3.5
    m_TimeScale: 1
    m_ParentTrack: {fileID: -8598574821997719789}
    m_EaseInDuration: 0
@ -1702,7 +1702,7 @@ AnimationClip:
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
-        time: 3.3333333
+        time: 2.4
        value: {x: 90, y: 0.00007901464, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -1711,7 +1711,7 @@ AnimationClip:
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
-        time: 3.6666667
+        time: 3.5
        value: {x: 90, y: 0.00007901464, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -1719,15 +1719,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 4.1666665
-        value: {x: 0, y: 0.000002720692, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -1764,8 +1755,8 @@ AnimationClip:
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
-        time: 3.3333333
-        value: {x: 0, y: 0, z: 0}
+        time: 2.4
+        value: {x: 0, y: 0, z: -0.0075000525}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -1773,17 +1764,8 @@ AnimationClip:
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
-        time: 3.6666667
-        value: {x: -0.70370007, y: -0.00000071525574, z: 0}
-        inSlope: {x: -3.3777606, y: 0, z: 0}
-        outSlope: {x: -3.3777606, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 4.1666665
-        value: {x: -3.5107005, y: 0.7343972, z: 0.051200032}
+        time: 3.5
+        value: {x: 0, y: 0, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -1828,7 +1810,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 4.1666665
+    m_StopTime: 3.5
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -1876,7 +1858,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.3333333
+        time: 2.4
        value: 90
        inSlope: 0
        outSlope: 0
@ -1885,7 +1867,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.6666667
+        time: 3.5
        value: 90
        inSlope: 0
        outSlope: 0
@ -1893,15 +1875,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.1666665
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -1942,7 +1915,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.3333333
+        time: 2.4
        value: 0.00007901464
        inSlope: 0
        outSlope: 0
@ -1951,7 +1924,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.6666667
+        time: 3.5
        value: 0.00007901464
        inSlope: 0
        outSlope: 0
@ -1959,15 +1932,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.1666665
-        value: 0.000002720692
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -2008,7 +1972,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.3333333
+        time: 2.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -2017,16 +1981,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.6666667
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.1666665
+        time: 3.5
        value: 0
        inSlope: 0
        outSlope: 0
@ -2074,7 +2029,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.3333333
+        time: 2.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -2083,17 +2038,8 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.6666667
-        value: -0.70370007
-        inSlope: -3.3777606
-        outSlope: -3.3777606
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.1666665
-        value: -3.5107005
+        time: 3.5
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -2140,7 +2086,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.3333333
+        time: 2.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -2149,17 +2095,8 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.6666667
-        value: -0.00000071525574
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.1666665
-        value: 0.7343972
+        time: 3.5
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -2206,8 +2143,8 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.3333333
-        value: 0
+        time: 2.4
+        value: -0.0075000525
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -2215,7 +2152,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 3.6666667
+        time: 3.5
        value: 0
        inSlope: 0
        outSlope: 0
@ -2223,15 +2160,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.1666665
-        value: 0.051200032
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/ZhiChi_FangHuiZhuoZi.playable
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/ZhiChi_FangHuiZhuoZi.playable
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/ZhiChi_FangHuiZhuoZi.playable.meta
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/TimeLine/ZhiChi_FangHuiZhuoZi.playable.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bbbf33be81cd84a47aee62b21a054cdf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/14.0,164.5.png
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/14.0,164.5.png
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/14.0,164.5.png.meta
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/14.0,164.5.png.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 3e5d2e79ff73bb044ae758d87899d9b1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/9.0,164.5.png
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/9.0,164.5.png
--- a/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/9.0,164.5.png.meta
+++ b/Assets/Projects/AnHui/BaoShiZhuoMoJiaGong/UI/9.0,164.5.png.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 2f7bff97aad50fb48a07f89115eb47a4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/ExameScene/BaoShiZhuoMoJiaGong.unity
+++ b/Assets/Scenes/ExameScene/BaoShiZhuoMoJiaGong.unity
--- a/Assets/Scripts/UI/UIInstruction.cs
+++ b/Assets/Scripts/UI/UIInstruction.cs
@ -92,7 +92,11 @@ namespace QFramework.Example
        protected override void OnHide()
        {
            mData = null;
+            // 防止后面紧接着的Action接收不到此消息 延迟0.1秒发送
+            ActionKit.Delay(0.1f, () =>
+            {
                StringEventSystem.Global.Send(this.GetType().Name + "Hide");
+            }).StartGlobal();
        }

        protected override void OnClose()
--- a/Assets/Scripts/UI/UIResultTip.cs
+++ b/Assets/Scripts/UI/UIResultTip.cs
@ -23,6 +23,8 @@ namespace QFramework.Example
            Right.gameObject.SetActive(false);
            Wrong.gameObject.SetActive(false);
            TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
+          
+        
        }

        private void OnStepChanged(StepStatusOnChange change)
@ -31,6 +33,7 @@ namespace QFramework.Example
        }
        protected override void OnOpen(IUIData uiData = null)
        {
+            transform.SetAsLastSibling();
            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
            Right.gameObject.SetActive(false);
            Wrong.gameObject.SetActive(false);
--- a/Data/Xml/BaoShiZhuoMoJiaGong.xml
+++ b/Data/Xml/BaoShiZhuoMoJiaGong.xml
@ -156,6 +156,9 @@
            <Action type="Show" value="Main/PeiYangMin" isShow="false"></Action>


+            <!--隐藏数值UI-->
+            <Action type="Show" value="Main/SM_YanMoJi/Box082/Canvas/14.0,164.5" isShow="false"></Action>
+            <Action type="Show" value="Main/SM_YanMoJi/Box082/Canvas/9.0,164.5" isShow="false"></Action>



@ -718,6 +721,8 @@
        <Action type="UIShow" value="UITools" isShow="false"></Action>


+          <Action type="Move" value="FlyCamera" to="-2.017345,1.291999,-3.254362" time="0"></Action>
+          <Action type="Rotate" value="FlyCamera" to="22.88609,177.8605,-2.8960" time="0"></Action>


          <!--粘竿安装到八角手，并且顺时针旋转-->
@ -754,12 +759,24 @@
        <Action type="UIShow" value="UITools" isShow="false"></Action>


+          <!--相机视角-->
+          <Action type="Move" value="FlyCamera" to="-1.819354,1.278643,-3.546013" time="0"></Action>
+          <Action type="Rotate" value="FlyCamera" to="26.88824,265.1613,9.57263E-07" time="0"></Action>


          <!--直尺 测量，组装后八角手高度-->
-        <Action type="TimeLine" value="TimeLines/ZhiChi_CeLiangBaJiaoShou" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="250"></Action>
+        <Action type="TimeLine" value="TimeLines/ZhiChi_CeLiangBaJiaoShou" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="210"></Action>


+          <Action type="Delay" value="1"></Action>
+
+          <!--相机视角-->
+          <Action type="Move" value="FlyCamera" to="-1.819354,1.278643,-3.546013" time="0"></Action>
+          <Action type="Rotate" value="FlyCamera" to="26.88824,265.1613,9.57263E-07" time="0"></Action>
+
+
+          <!--直尺，放回到桌子上-->
+          <Action type="TimeLine" value="TimeLines/ZhiChi_FangHuiZhuoZi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="120"></Action>


        </Action>
@ -778,13 +795,20 @@


        <Action type="Input" title="请输入" finishedEvent="UI关闭事件通知用StrEvent接收">
-          <Input name="数字1:" var="变量1" answer="164.5"></Input>
+          <Input name="测量的八角手的长度:" var="变量1" answer="164.5"></Input>
          <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
          <!--<Btn name="取消"></Btn>-->
        </Action>
        <Condition type="StrEvent" value="UI关闭事件通知用StrEvent接收"></Condition>


+       
+
+        <!--显示触控屏数字-->
+        <Action type="Show" value="Main/SM_YanMoJi/Box082/Canvas/14.0,164.5" isShow="true"></Action>
+
+
+
      </Action>


@ -838,6 +862,8 @@
        </Action>
        <Condition type="StrEvent" value="UI关闭事件通知用StrEvent接收"></Condition>

+          <!--9.0 ，164.5数值贴图显示-->
+          <Action type="Show" value="Main/SM_YanMoJi/Box082/Canvas/9.0,164.5" isShow="true"></Action>

          <Action type="NextOperation"></Action>
Author	SHA1	Message	Date
Lihao7788	c5e1413bf0	提交修改内容	2025-03-18 11:08:17 +08:00
Lihao7788	99c1d330eb	Merge remote-tracking branch 'origin/master' into AnHui_BaoShi	2025-03-18 10:36:13 +08:00
shenjianxing	7f106d7246	修改UI关闭通知延迟0.1秒发送	2025-03-14 17:10:45 +08:00
shenjianxing	ad227f0582	修复bug	2025-03-14 14:18:59 +08:00