demo

新增技能模块测试

Masterdulepre/Assembly-CSharp.csproj

@@ -120,6 +120,7 @@
     <Compile Include="Assets\XFramework\Sprite\SpriteCfg.cs" />
     <Compile Include="Assets\XFramework\LitJson\JsonData.cs" />
     <Compile Include="Assets\XFramework\sproto\SprotoDef\c2s.cs" />
+    <Compile Include="Assets\XFramework\Text\TextBend.cs" />
     <Compile Include="Assets\XFramework\Text\MyText.cs" />
     <Compile Include="Assets\LuaFramework\ToLua\Source\Generate\UnityEngine_SkinnedMeshRendererWrap.cs" />
     <Compile Include="Assets\LuaFramework\ToLua\BaseType\System_Collections_ObjectModel_ReadOnlyCollectionWrap.cs" />
@@ -339,7 +340,6 @@
     <Compile Include="Assets\LuaFramework\ToLua\BaseType\UnityEngine_LightWrap.cs" />
     <Compile Include="Assets\Lux URP Essentials\Demos\Scripts\ExtendedFlycam.cs" />
     <Compile Include="Assets\LuaFramework\ToLua\Reflection\LuaField.cs" />
-    <Compile Include="Assets\XFramework\Text\TextBend.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\Lux URP Essentials\Demos\Fonts\ZwriteFont.shader" />

Masterdulepre/UserSettings/Layouts/default-2021.dwlt

@@ -121,7 +121,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 16
+  controlID: 86
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -221,8 +221,8 @@ MonoBehaviour:
     y: 0
     width: 311
     height: 947
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -456,7 +456,7 @@ MonoBehaviour:
   m_Position:
     m_Target: {x: -9.00257, y: 9.910992, z: 100.648315}
     speed: 2
-    m_Value: {x: 996.22974, y: 232.89926, z: -111.323586}
+    m_Value: {x: -9.00257, y: 9.910992, z: 100.648315}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -505,12 +505,11 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.0000000029231944, y: 0.000000044607308, z: -0.0000000027207592,
-      w: -1.0000001}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
     m_Target: 89.06406
     speed: 2
-    m_Value: 172.75117
+    m_Value: 89.06406
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -528,7 +527,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.044560213, y: 0.67997915, z: -0.04147436, w: -0.7309442}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -556,8 +555,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -32000
-    y: -31970
+    x: 0
+    y: 73
     width: 413
     height: 926
   m_ViewDataDictionary: {fileID: 0}
@@ -569,7 +568,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: c2daf6ff94dff6ff440df7ff1612f8ff2612f8ff6c25f8ff7a25f8ff8625f8ff08b3fdff38fbfffff86800001e6900002c690000366900005a690000
+      m_ExpandedIDs: 38fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -741,9 +740,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: e6690000
-    m_LastClickedID: 27110
-    m_ExpandedIDs: 00000000a0690000a2690000a4690000a6690000a8690000aa690000ac690000ae690000b0690000b2690000b4690000b6690000b8690000ba690000bc690000be690000c0690000c2690000c4690000c6690000ce690000d0690000f6690000008b000000ca9a3b
+    m_SelectedIDs: 786c0000
+    m_LastClickedID: 27768
+    m_ExpandedIDs: 000000007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -771,7 +770,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000a0690000a2690000a4690000a6690000a8690000aa690000ac690000ae690000b0690000b2690000b4690000b6690000b8690000ba690000bc690000be690000c0690000c2690000c4690000c6690000
+    m_ExpandedIDs: 000000007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -798,7 +797,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: c6230000e05c0000f45c00007a8300001a6b0000086e00008c7d0000787d0000000000000e8a00005c6b0000e4270200a8270200b2310200a63102001a320200d81d01008a720000c0cb00009e8d000030cb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0

MilandaSkillDemo @ 1619ad8c

+Subproject commit 1619ad8cfedd72f9c2a463d5cdb08fd87078f4f1