Jelajahi Sumber

打包节点

TTTN1997 1 tahun lalu
induk
melakukan
da1df42eb0

+ 3 - 39
Assets/Art/dabaojian.playable

@@ -738,7 +738,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -808,25 +808,7 @@ MonoBehaviour:
       m_RotationOrder: 4
     m_MixOutCurve:
       serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -853,25 +835,7 @@ MonoBehaviour:
     m_BlendOutDuration: -1
     m_MixInCurve:
       serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4

+ 40 - 40
Assets/Scenes/main.unity

@@ -5908,43 +5908,6 @@ Transform:
   m_Father: {fileID: 6933930956171087367}
   m_RootOrder: 70
   m_LocalEulerAnglesHint: {x: 15.193, y: 85.715, z: -12.059}
---- !u!84 &184002534
-RenderTexture:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 5
-  m_Width: 256
-  m_Height: 256
-  m_AntiAliasing: 1
-  m_MipCount: -1
-  m_DepthStencilFormat: 0
-  m_ColorFormat: 8
-  m_MipMap: 0
-  m_GenerateMips: 1
-  m_SRGB: 0
-  m_UseDynamicScale: 0
-  m_BindMS: 0
-  m_EnableCompatibleFormat: 1
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_Dimension: 2
-  m_VolumeDepth: 1
-  m_ShadowSamplingMode: 2
 --- !u!1 &191733989
 GameObject:
   m_ObjectHideFlags: 0
@@ -16613,7 +16576,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 184002534}
+        m_Texture: {fileID: 2011968897}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -16636,7 +16599,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DetailColor: {r: 0.5533019, g: 0.5533019, b: 0.5533019, a: 0}
     - _DetailData: {r: 0.5, g: 4, b: -0.5, a: 0}
-    - _DetailWindDirection: {r: -0.0035333333, g: 0, b: 0, a: 0}
+    - _DetailWindDirection: {r: -0.0002, g: 0, b: 0, a: 0}
     - _DistanceData: {r: 0, g: 5, b: 1, a: 1}
     - _FogOfWarCenter: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarCenterAdjusted: {r: 0, g: 0, b: 0, a: 1}
@@ -16647,7 +16610,7 @@ Material:
     - _ShadowData: {r: 0.5, g: 0, b: 62500, a: 0}
     - _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _SunDir: {r: 0.49525782, g: 0.36346677, b: 0.78905755, a: 0}
-    - _WindDirection: {r: -0.0035333333, g: 0, b: 0, a: 0}
+    - _WindDirection: {r: -0.0002, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!4 &1833292951
 Transform:
@@ -21968,6 +21931,43 @@ LODGroup:
     renderers:
     - renderer: {fileID: 307741535}
   m_Enabled: 1
+--- !u!84 &2011968897
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
 --- !u!1001 &2015702648
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/Mono/UI/Core/TimeComponent.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using UnityEditor.Search;
+
 using UnityEngine;
 using Utility;
 

+ 6 - 38
Assets/Scripts/Mono/UI/Panel/TipPanel.cs

@@ -21,12 +21,18 @@ namespace Mono
         }
 
 
+        private PlayableDirector playableDirector;
         public override void Show()
         {
             base.Show();
             index = 0;
             Text_01.StringContent = "龙泉剑\n在白帝城偶遇诗仙李白获赠的随身佩剑";
             Text_01.SetContent();
+            
+             playableDirector = GameObject.Find("timeline").gameObject.GetComponent<PlayableDirector>();
+
+
+            ResetTrackAsset(playableDirector);
         }
 
         private int index = 0;
@@ -62,10 +68,7 @@ namespace Mono
 
         public void DBJNext()
         {
-            PlayableDirector playableDirector = GameObject.Find("timeline").gameObject.GetComponent<PlayableDirector>();
 
-
-            ResetTrackAsset(playableDirector);
             MuteAll();
 
             foreach (var trackGroup in trackGroups)
@@ -92,41 +95,6 @@ namespace Mono
                         break;
                 }
             }
-            // foreach (var playableAssetOutput in playableDirector.playableAsset.outputs)
-            // {
-            //   
-            //     TrackAsset asset = playableAssetOutput.sourceObject as TrackAsset;
-            //     asset.muted = true;
-            // }
-            //
-            //
-            // foreach (var playableAssetOutput in playableDirector.playableAsset.outputs)
-            // {
-            //     TrackAsset asset = playableAssetOutput.sourceObject as TrackAsset;
-            //
-            //
-            //     switch (index)
-            //     {
-            //         case 0:
-            //             
-            //             if (asset.GetGroup().name == "1")
-            //             {
-            //                 asset.muted = false;
-            //             }
-            //
-            //             break;
-            //
-            //         case 1:
-            //
-            //             if (asset.GetGroup().name == "2")
-            //             {
-            //                 asset.muted = false;
-            //             }
-            //
-            //
-            //             break;
-            //     }
-            // }
 
             playableDirector.time = 0;
             playableDirector.Play();

+ 24 - 8
EXE/PoetryTour_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64/lib_burst_generated.txt

@@ -118,17 +118,25 @@ Library: E:\MyGameProject\PoetryTour\Temp\StagingArea\Data\Plugins\x86_64\lib_bu
 --compilation-defines=CSHARP_7_3_OR_NEWER
 --compilation-defines=ENABLE_VR_MODULE
 --compilation-defines=ENABLE_XR_MODULE
+--compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
+--compilation-defines=USING_ANIMATION_MODULE
+--compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=MODULE_AI_EXISTS
 --compilation-defines=MODULE_ANIMATION_EXISTS
 --compilation-defines=MODULE_PHYSICS_EXISTS
 --compilation-defines=MODULE_PHYSICS_2D_EXISTS
 --compilation-defines=MODULE_PARTICLE_SYSTEM_EXISTS
---compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
---compilation-defines=USING_ANIMATION_MODULE
---compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=ENABLE_ANIMATION_BURST
---compilation-defines=TIMELINE_FRAMEACCURATE
+--compilation-defines=CINEMACHINE_TIMELINE
+--compilation-defines=CINEMACHINE_PHYSICS_2D
+--compilation-defines=CINEMACHINE_PHYSICS
+--compilation-defines=CINEMACHINE_UGUI
+--compilation-defines=CINEMACHINE_LWRP_7_3_1
+--compilation-defines=CINEMACHINE_PIXEL_PERFECT_2_0_3
+--compilation-defines=CINEMACHINE_UNITY_ANIMATION
+--compilation-defines=CINEMACHINE_UNITY_IMGUI
 --compilation-defines=ENABLE_SPRITESHAPE_BURST
+--compilation-defines=TIMELINE_FRAMEACCURATE
 --compilation-defines=ENABLE_URP
 --linker-options=PdbAltPath="PoetryTour_Data/Plugins/x86_64/lib_burst_generated.pdb"
 --generate-link-xml=Temp\burst.link.xml
@@ -271,17 +279,25 @@ Library: E:\MyGameProject\PoetryTour\Temp\StagingArea\Data\Plugins\x86_64\lib_bu
 --compilation-defines=CSHARP_7_3_OR_NEWER
 --compilation-defines=ENABLE_VR_MODULE
 --compilation-defines=ENABLE_XR_MODULE
+--compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
+--compilation-defines=USING_ANIMATION_MODULE
+--compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=MODULE_AI_EXISTS
 --compilation-defines=MODULE_ANIMATION_EXISTS
 --compilation-defines=MODULE_PHYSICS_EXISTS
 --compilation-defines=MODULE_PHYSICS_2D_EXISTS
 --compilation-defines=MODULE_PARTICLE_SYSTEM_EXISTS
---compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
---compilation-defines=USING_ANIMATION_MODULE
---compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=ENABLE_ANIMATION_BURST
---compilation-defines=TIMELINE_FRAMEACCURATE
+--compilation-defines=CINEMACHINE_TIMELINE
+--compilation-defines=CINEMACHINE_PHYSICS_2D
+--compilation-defines=CINEMACHINE_PHYSICS
+--compilation-defines=CINEMACHINE_UGUI
+--compilation-defines=CINEMACHINE_LWRP_7_3_1
+--compilation-defines=CINEMACHINE_PIXEL_PERFECT_2_0_3
+--compilation-defines=CINEMACHINE_UNITY_ANIMATION
+--compilation-defines=CINEMACHINE_UNITY_IMGUI
 --compilation-defines=ENABLE_SPRITESHAPE_BURST
+--compilation-defines=TIMELINE_FRAMEACCURATE
 --compilation-defines=ENABLE_URP
 --linker-options=PdbAltPath="PoetryTour_Data/Plugins/x86_64/lib_burst_generated.pdb"
 --generate-link-xml=Temp\burst.link.xml