1

2025-11-17 20:36:31 +08:00 · 2025-11-17 20:36:31 +08:00 · 74d1909190
commit 74d1909190
parent b36510997e
21 changed files with 109 additions and 65 deletions
--- a/Client/Assets/Test.meta
+++ b/Client/Assets/Test.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4025b873a159f75468339766a444fb0b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameBase.dll.bytes
+++ b/Client/Assets/Test/GameBase.dll.bytes
--- a/Client/Assets/Test/GameBase.dll.bytes.meta
+++ b/Client/Assets/Test/GameBase.dll.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 01521bb4cc77d5845b437a3f9c31a223
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameBase.pdb.bytes
+++ b/Client/Assets/Test/GameBase.pdb.bytes
--- a/Client/Assets/Test/GameBase.pdb.bytes.meta
+++ b/Client/Assets/Test/GameBase.pdb.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5e7e3af5205c28a4e880fe29616a369b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameLib.dll.bytes
+++ b/Client/Assets/Test/GameLib.dll.bytes
--- a/Client/Assets/Test/GameLib.dll.bytes.meta
+++ b/Client/Assets/Test/GameLib.dll.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2fd69364c386ccf4c9583fa369bda920
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameLib.pdb.bytes
+++ b/Client/Assets/Test/GameLib.pdb.bytes
--- a/Client/Assets/Test/GameLib.pdb.bytes.meta
+++ b/Client/Assets/Test/GameLib.pdb.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd6dc3322dbc30141b84af8c3483c087
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameLogic.dll.bytes
+++ b/Client/Assets/Test/GameLogic.dll.bytes
--- a/Client/Assets/Test/GameLogic.dll.bytes.meta
+++ b/Client/Assets/Test/GameLogic.dll.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 086c9a47d8ecc0e4a839c266ebe693a0
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameLogic.pdb.bytes
+++ b/Client/Assets/Test/GameLogic.pdb.bytes
--- a/Client/Assets/Test/GameLogic.pdb.bytes.meta
+++ b/Client/Assets/Test/GameLogic.pdb.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e6cf84ef7c70e874f948c8c55d882ef0
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameProto.dll.bytes
+++ b/Client/Assets/Test/GameProto.dll.bytes
--- a/Client/Assets/Test/GameProto.dll.bytes.meta
+++ b/Client/Assets/Test/GameProto.dll.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 13c303c321c795544a66242210c0c62b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/Test/GameProto.pdb.bytes
+++ b/Client/Assets/Test/GameProto.pdb.bytes
--- a/Client/Assets/Test/GameProto.pdb.bytes.meta
+++ b/Client/Assets/Test/GameProto.pdb.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8475613a7f1b2944a9ca8fcac385e9ae
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Packages/com.alicizax.unity.packagemanager
+++ b/Client/Packages/com.alicizax.unity.packagemanager
@ -1 +1 @@
-Subproject commit 9401433139c654b26064e9dd30ca45baca3d5abb
+Subproject commit 6ed2a259b71aa2471985ff413594c154fdde79fa
--- a/Client/Packages/manifest.json
+++ b/Client/Packages/manifest.json
@ -13,7 +13,6 @@
    "com.unity.textmeshpro": "3.0.9",
    "com.unity.timeline": "1.8.8",
    "com.unity.ugui": "2.0.0",
-    "com.unity.visualscripting": "1.9.6",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
    "com.unity.modules.animation": "1.0.0",
--- a/Client/Packages/packages-lock.json
+++ b/Client/Packages/packages-lock.json
@ -49,9 +49,7 @@
      "version": "file:com.alicizax.unity.packagemanager",
      "depth": 0,
      "source": "embedded",
-      "dependencies": {
-        "com.unity.editorcoroutines": "1.0.0"
-      }
+      "dependencies": {}
    },
    "com.alicizax.unity.tuyoogame.yooasset": {
      "version": "file:com.alicizax.unity.tuyoogame.yooasset",
@ -101,13 +99,6 @@
      },
      "url": "https://packages.unity.cn"
    },
-    "com.unity.editorcoroutines": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
      "depth": 1,
@ -251,16 +242,6 @@
        "com.unity.modules.imgui": "1.0.0"
      }
    },
-    "com.unity.visualscripting": {
-      "version": "1.9.6",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
    "com.unity.modules.ai": {
      "version": "1.0.0",
      "depth": 0,
--- a/Client/UserSettings/Layouts/default-2022.dwlt
+++ b/Client/UserSettings/Layouts/default-2022.dwlt
@ -41,7 +41,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 349
-    width: 384
+    width: 147
    height: 598
  m_MinSize: {x: 51, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
@ -69,7 +69,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 384
+    width: 147
    height: 947
  m_MinSize: {x: 100, y: 100}
  m_MaxSize: {x: 8096, y: 16192}
@ -173,7 +173,7 @@ MonoBehaviour:
  m_MinSize: {x: 400, y: 100}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 144
+  controlID: 145
  draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@ -192,10 +192,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 384
+    width: 147
    height: 349
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 16}
  m_Panes:
  - {fileID: 15}
@ -219,14 +219,14 @@ MonoBehaviour:
  - {fileID: 11}
  m_Position:
    serializedVersion: 2
-    x: 384
+    x: 147
    y: 0
-    width: 349
+    width: 515
    height: 947
  m_MinSize: {x: 100, y: 100}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 70
+  controlID: 71
  draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@ -245,7 +245,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 349
+    width: 515
    height: 454
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
@ -271,10 +271,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 454
-    width: 349
+    width: 515
    height: 493
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 18}
  m_Panes:
  - {fileID: 18}
@ -295,9 +295,9 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 733
+    x: 662
    y: 0
-    width: 542
+    width: 613
    height: 947
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
@ -325,8 +325,8 @@ MonoBehaviour:
    y: 0
    width: 645
    height: 947
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 20}
  m_Panes:
  - {fileID: 20}
@ -353,8 +353,8 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 368
-    width: 383
+    y: 422
+    width: 146
    height: 577
  m_SerializedDataModeController:
    m_DataMode: 0
@ -408,10 +408,10 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 383
+      width: 146
      height: 556
-    m_Scale: {x: 0.19947916, y: 0.19947916}
-    m_Translation: {x: 191.5, y: 278}
+    m_Scale: {x: 0.07604167, y: 0.07604167}
+    m_Translation: {x: 73, y: 278}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
@ -419,12 +419,12 @@ MonoBehaviour:
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
      x: -960
-      y: -1393.6293
+      y: -3655.8904
      width: 1920
-      height: 2787.2585
+      height: 7311.781
    m_MinimalGUI: 1
-  m_defaultScale: 0.19947916
-  m_LastWindowPixelSize: {x: 383, y: 577}
+  m_defaultScale: 0.07604167
+  m_LastWindowPixelSize: {x: 146, y: 577}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@ -521,8 +521,8 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 19
-    width: 383
+    y: 73
+    width: 146
    height: 328
  m_SerializedDataModeController:
    m_DataMode: 0
@ -539,7 +539,7 @@ MonoBehaviour:
      collapsed: 0
      displayed: 1
      snapOffset: {x: -174, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 28, y: 0}
      snapCorner: 3
      id: Tool Settings
      index: 0
@ -552,7 +552,7 @@ MonoBehaviour:
      collapsed: 0
      displayed: 1
      snapOffset: {x: -179, y: 25}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 33, y: 0}
      snapCorner: 1
      id: unity-grid-and-snap-toolbar
      index: 1
@ -1137,9 +1137,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 384
+    x: 147
    y: 73
-    width: 347
+    width: 513
    height: 433
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1154,9 +1154,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: f8820000
      m_LastClickedID: 0
-      m_ExpandedIDs: 1eddffff20ddffff00e9ffff2ee9ffff30e9ffff32eaffff80edffff76f3ffff9cf3ffff28f9ffff22fbffffea8400006085000072850000e6870000008800000a8800001a880000228800003e88000048880000528800005c880000
+      m_ExpandedIDs: a4f0ffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -1200,9 +1200,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 384
+    x: 147
    y: 527
-    width: 347
+    width: 513
    height: 472
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1234,9 +1234,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 733
+    x: 662
    y: 73
-    width: 540
+    width: 611
    height: 926
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1259,7 +1259,7 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Packages/com.alicizax.unity.editor.extension/Editor/Toolbar
+    - Packages/com.unity.timeline
    m_Globs: []
    m_OriginalText: 
    m_ImportLogFlags: 0
@ -1275,7 +1275,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: e48c0000
    m_LastClickedID: 36068
-    m_ExpandedIDs: 000000009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000b0820000b2820000b4820000b6820000b8820000ba820000bc820000be820000c0820000c2820000c4820000c6820000c8820000ca820000cc820000ce820000d0820000d2820000d4820000d6820000d8820000da820000dc820000de820000e0820000e2820000e4820000e6820000e8820000ea820000ec820000ee820000f0820000f2820000f4820000f6820000f8820000fa820000fc820000fe82000000830000028300000483000006830000088300000a8300000c8300000e83000010830000128300001483000016830000188300001a8300001c8300001e83000020830000228300002483000026830000288300002a8300002c8300002e83000030830000328300003483000036830000388300003a8300003c8300003e83000040830000428300004483000046830000488300004a8300004c8300004e83000050830000528300005483000056830000588300005a8300005c8300005e83000060830000628300006483000066830000688300006a8300006c8300006e83000070830000728300007483000076830000788300007a8300007c8300007e83000080830000828300008483000086830000888300008a8300008c8300008e83000090830000928300009483000096830000988300009a8300009c8300009e830000a0830000a2830000a4830000a6830000a8830000aa830000ac830000ae830000b0830000b2830000b4830000b6830000b8830000ba830000bc830000be830000c0830000c2830000c4830000c6830000c8830000ca830000cc830000ce830000d0830000d2830000d4830000d6830000d8830000da830000dc830000de830000e0830000e2830000e4830000e6830000e8830000ea830000ec830000ee830000f0830000f2830000f4830000f6830000f8830000fa830000fc830000fe83000000840000028400000484000006840000088400000a8400000c8400000e8400001084000012840000148400001684000018840000
+    m_ExpandedIDs: 000000002e81000030810000328100003481000036810000388100003a8100003c8100003e81000040810000428100004481000046810000488100004a8100004c8100004e81000050810000528100005481000056810000588100005a8100005c8100005e81000060810000628100006481000066810000688100006a8100006c8100006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000e8810000ea810000ec810000ee810000f0810000f2810000f4810000f6810000f8810000fa810000fc810000fe81000000820000028200000482000006820000088200000a8200000c8200000e82000010820000128200001482000016820000188200001a8200001c8200001e82000020820000228200002482000026820000288200002a8200002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000b0820000b2820000b4820000b6820000b8820000ba820000bc820000be820000c0820000c2820000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1300,10 +1300,10 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
+    scrollPos: {x: 0, y: 240}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff000000009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000b0820000b2820000b4820000b8820000ba820000be820000c0820000c2820000c4820000c6820000c8820000ca820000cc820000ce820000d0820000d2820000d4820000d6820000d8820000da820000dc820000de820000e0820000e2820000e4820000e6820000e8820000ea820000ec820000ee820000f0820000f2820000f4820000f6820000f8820000fa820000fc820000fe820000008300000283000006830000088300000a8300000c8300000e83000010830000128300001483000016830000188300001a8300001c8300001e83000020830000228300002483000026830000288300002a8300002c8300002e83000030830000328300003483000036830000388300003a8300003c8300003e83000040830000428300004483000046830000488300004a8300004c8300004e83000050830000528300005483000056830000588300005a8300005c8300005e83000060830000628300006483000066830000688300006a8300006c8300006e83000070830000728300007483000076830000788300007a8300007c8300007e83000080830000828300008483000086830000888300008a8300008c8300008e83000090830000928300009483000096830000988300009a8300009c8300009e830000a0830000a2830000a4830000a6830000a8830000aa830000ac830000ae830000b0830000b2830000b4830000b6830000b8830000ba830000bc830000be830000c0830000c2830000c4830000c6830000c8830000ca830000cc830000ce830000d0830000d2830000d4830000d6830000d8830000da830000dc830000de830000e0830000e2830000e4830000e6830000e8830000ea830000ec830000ee830000f0830000f2830000f4830000f6830000f8830000fa830000fc830000fe830000008400000284000004840000088400000a8400000e840000108400001484000016840000928400009a840000a0840000a6840000ae840000b0840000b2840000b4840000b6840000b8840000ea880000ec880000f8880000fa880000d6890000e6890000e8890000ee890000248a0000268a0000ffffff7f
+    m_ExpandedIDs: ffffffff000000002e81000030810000328100003481000036810000388100003a8100003c8100003e81000040810000428100004481000046810000488100004a8100004c8100004e81000050810000528100005481000056810000588100005a8100005c8100005e81000060810000628100006481000066810000688100006a8100006c8100006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000e8810000ea810000ec810000ee810000f0810000f2810000f4810000f6810000f8810000fa810000fc810000fe81000000820000028200000482000006820000088200000a8200000c8200000e82000010820000128200001482000016820000188200001a8200001c8200001e82000020820000228200002482000026820000288200002a8200002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e82000060820000628200006482000066820000688200006a8200006c8200006e82000070820000728200007482000076820000788200007a8200007c8200007e82000080820000828200008482000086820000888200008a8200008c8200008e82000090820000928200009482000096820000988200009a8200009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000b0820000b2820000b4820000b6820000b8820000ba820000bc820000be820000c0820000c2820000d4820000508300005a830000ffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1400,7 +1400,7 @@ MonoBehaviour:
    m_ControlHash: 1412526313
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 271
+  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0
  m_LockTracker: