修改差异

2024-12-28 18:48:02 +08:00 · 2024-12-28 18:48:02 +08:00 · 8883663e13
commit 8883663e13
parent 1ab7b6efb0
13 changed files with 585 additions and 399 deletions
--- a/Blacksmith/UserSettings/Layouts/default-2022.dwlt
+++ b/Blacksmith/UserSettings/Layouts/default-2022.dwlt
@ -67,7 +67,7 @@ MonoBehaviour:
    width: 1920
    height: 989
  m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Console
  m_RootView: {fileID: 12}
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
@ -122,7 +122,7 @@ MonoBehaviour:
  m_MinSize: {x: 100, y: 50}
  m_MaxSize: {x: 8096, y: 8096}
  vertical: 0
-  controlID: 93
+  controlID: 38
  draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@ -199,7 +199,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 100}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 173
+  controlID: 123
  draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@ -216,12 +216,12 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1614
+    x: 1573
    y: 0
-    width: 306
+    width: 347
    height: 939
-  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: 22}
  m_Panes:
  - {fileID: 22}
@ -244,10 +244,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 405
-    height: 572
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 385
+    height: 525
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 23}
  m_Panes:
  - {fileID: 23}
@ -269,11 +269,11 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 572
-    width: 1614
-    height: 367
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    y: 525
+    width: 1573
+    height: 414
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 25}
  m_Panes:
  - {fileID: 21}
@ -370,12 +370,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1614
+    width: 1573
    height: 939
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 137
+  controlID: 76
  draggingID: 0
 --- !u!114 &16
 MonoBehaviour:
@ -396,12 +396,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1614
-    height: 572
+    width: 1573
+    height: 525
  m_MinSize: {x: 200, y: 50}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 127
+  controlID: 77
  draggingID: 0
 --- !u!114 &17
 MonoBehaviour:
@ -418,12 +418,12 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 405
+    x: 385
    y: 0
-    width: 1209
-    height: 572
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 1188
+    height: 525
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 24}
  m_Panes:
  - {fileID: 24}
@ -580,9 +580,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 645
-    width: 1613
-    height: 346
+    y: 598
+    width: 1572
+    height: 393
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
@ -604,24 +604,24 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Script/SDK
+    - Assets/Pack/UI
    m_Globs: []
    m_OriginalText: 
    m_ImportLogFlags: 0
    m_FilterByTypeIntersection: 0
  m_ViewMode: 1
-  m_StartGridSize: 96
+  m_StartGridSize: 87
  m_LastFolders:
-  - Assets/Script/SDK
-  m_LastFoldersGridSize: 96
-  m_LastProjectPath: E:\UnityProject\Game\Blacksmith
+  - Assets/Pack/UI
+  m_LastFoldersGridSize: 87
+  m_LastProjectPath: E:\Project\WXGame\Blacksmith
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 180}
-    m_SelectedIDs: 78730000
-    m_LastClickedID: 29560
-    m_ExpandedIDs: 00000000de880000
+    scrollPos: {x: 0, y: 120}
+    m_SelectedIDs: 3ca70000
+    m_LastClickedID: 42812
+    m_ExpandedIDs: 00000000848f0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -649,7 +649,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000de880000
+    m_ExpandedIDs: 00000000848f0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -674,10 +674,10 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 8e230100
-    m_LastClickedInstanceID: 74638
-    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c623000044860000228500003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000000000004683000040830000388300005c830000aa780000d0690000e4690000f06a0000c06b00003a6a000070360500107a0000e27900009e6a0000267a0000387a00001e7a000082500200f0790000287a00007c7d00007aa100002a130100381301001a8300000c83000068f9020036890000c4d40000
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: c623000044860000228500003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000000000004683000040830000388300005c830000aa780000d0690000e4690000f06a0000c06b00003a6a000070360500107a0000e27900009e6a0000267a0000387a00001e7a000082500200f0790000287a00007c7d00007aa100002a130100381301001a8300000c83000068f90200e88a0000728a00006a8d0000768a0000208a00006e8a0000008e0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -702,7 +702,7 @@ MonoBehaviour:
      m_ResourceFile: 
    m_NewAssetIndexInList: -1
    m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 96
+    m_GridSize: 87
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 379
 --- !u!114 &22
@ -725,9 +725,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1614
+    x: 1573
    y: 73
-    width: 305
+    width: 346
    height: 918
  m_SerializedDataModeController:
    m_DataMode: 0
@ -742,7 +742,7 @@ MonoBehaviour:
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
  m_PreviewResizer:
-    m_CachedPref: 267
+    m_CachedPref: 151
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
@ -774,8 +774,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 73
-    width: 404
-    height: 551
+    width: 384
+    height: 504
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
@ -789,9 +789,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: f6750000
-      m_LastClickedID: 30198
-      m_ExpandedIDs: 16fbffffb071000066720000fa740000f6750000ce7600006e7a000054850000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: c8d9ffff16fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -835,10 +835,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 405
+    x: 385
    y: 73
-    width: 1207
-    height: 551
+    width: 1186
+    height: 504
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
@ -931,7 +931,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: 80}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: Orientation
@ -1210,9 +1210,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 722.6698, y: 877.4148, z: 21.222715}
+    m_Target: {x: -1107.1886, y: -88.10409, z: -14.780278}
    speed: 2
-    m_Value: {x: 736.0171, y: 877.95197, z: 21.00577}
+    m_Value: {x: -1107.1886, y: -88.10409, z: -14.780278}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -1262,9 +1262,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 460.4067
+    m_Target: 1485.6224
    speed: 2
-    m_Value: 482.10126
+    m_Value: 1485.6224
  m_Ortho:
    m_Target: 1
    speed: 2
@ -1310,9 +1310,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 645
-    width: 1613
-    height: 346
+    y: 598
+    width: 1572
+    height: 393
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
--- a/box1/Assets/Editor/StarkBuilderSetting.asset
+++ b/box1/Assets/Editor/StarkBuilderSetting.asset
@ -44,7 +44,7 @@ MonoBehaviour:
  a: tt2f5a59e7b06fb35a07
  version: 
  autoVersion: 0
-  b: E:\Project\apk\BoxDY\webgl_package-20241220_150858.zip
+  b: E:\Project\apk\BoxDY\webgl_package-20241228_182428.zip
  c: 0
  d: 0
  e: 0
--- a/box1/Assets/Prefab/TT/Canvas.prefab
+++ b/box1/Assets/Prefab/TT/Canvas.prefab
@ -864,6 +864,7 @@ RectTransform:
  - {fileID: 3534973460396062554}
  - {fileID: 723470353586404833}
  - {fileID: 928862098692261376}
+  - {fileID: 8141764428346637989}
  - {fileID: 7903445018735180856}
  - {fileID: 15815909071991882}
  - {fileID: 5277501625250198989}
@ -949,7 +950,7 @@ MonoBehaviour:
  event2Video: {fileID: 6042397047633695143}
  eventButton1: {fileID: 3838309414256967349}
  eventButton2: {fileID: 4960505906423506548}
-  timeButton: {fileID: 0}
+  timeButton: {fileID: 4688882427578778920}
  close: {fileID: 2429796358503295671}
  settingButton: {fileID: 6572810902699390605}
  audioButton: {fileID: 8750277471665442816}
@ -3245,6 +3246,85 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &508480109655984279
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7253355387296583475}
+  - component: {fileID: 999678343180026420}
+  - component: {fileID: 4189099595249002627}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7253355387296583475
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 508480109655984279}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8141764428346637989}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &999678343180026420
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 508480109655984279}
+  m_CullTransparentMesh: 1
+--- !u!114 &4189099595249002627
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 508480109655984279}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 2198231395b4bc14eb6e7595452efc46, type: 3}
+    m_FontSize: 98
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 160
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: X3 Time
 --- !u!1 &520921606030734613
 GameObject:
  m_ObjectHideFlags: 0
@ -12592,9 +12672,9 @@ RectTransform:
  - {fileID: 9100024851915812621}
  m_Father: {fileID: 6198905375397856769}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -6.9, y: -752.5405}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -6.9, y: 527.4595}
  m_SizeDelta: {x: 600, y: 250}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4813976993191608751
@ -17924,10 +18004,10 @@ RectTransform:
  - {fileID: 567643179385499783}
  m_Father: {fileID: 6198905375397856769}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.3, y: -1018}
-  m_SizeDelta: {x: 440.1879, y: 172.2474}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.3, y: 262}
+  m_SizeDelta: {x: 440.1879, y: 172.24744}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5060217876962108375
 CanvasRenderer:
@ -32586,11 +32666,6 @@ MonoBehaviour:
  tourPanel: {fileID: 3653558194215937322}
  homePanel: {fileID: 3465158670329160665}
  rankPanel: {fileID: 7197723777118329947}
-  winrestButton: {fileID: 3696750439895456399}
-  wincloseButton: {fileID: 1116548788586638294}
-  loseRestButton: {fileID: 8168708913393663016}
-  loseCloseButton: {fileID: 3802462431810524433}
-  _textMeshPro: {fileID: 0}
 --- !u!1 &6600090833936658984
 GameObject:
  m_ObjectHideFlags: 0
@ -34522,6 +34597,127 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6876716763154821316}
  m_CullTransparentMesh: 1
+--- !u!1 &6877763560082451094
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8141764428346637989}
+  - component: {fileID: 2195244406705621482}
+  - component: {fileID: 3053886772570939433}
+  - component: {fileID: 4688882427578778920}
+  m_Layer: 5
+  m_Name: Button (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8141764428346637989
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6877763560082451094}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7253355387296583475}
+  m_Father: {fileID: 7460618339752046935}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -169.61206, y: -210.74072}
+  m_SizeDelta: {x: 182.7758, y: 141.4814}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2195244406705621482
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6877763560082451094}
+  m_CullTransparentMesh: 1
+--- !u!114 &3053886772570939433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6877763560082451094}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4688882427578778920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6877763560082451094}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3053886772570939433}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6961859976593192027
 GameObject:
  m_ObjectHideFlags: 0
--- a/box1/Assets/Prefab/TT/GameManager.prefab
+++ b/box1/Assets/Prefab/TT/GameManager.prefab
@ -11,7 +11,6 @@ GameObject:
  - component: {fileID: 6803727100674661118}
  - component: {fileID: 917973986138628825}
  - component: {fileID: 1130956779281052304}
-  - component: {fileID: 4280015988878280450}
  m_Layer: 0
  m_Name: GameManager
  m_TagString: Untagged
@ -123,15 +122,3 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 11d45a75c18b509489665e6e4594964c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!114 &4280015988878280450
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5001869006341606833}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ce9e131c48914344cb9f2434d4e52043, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/box1/Assets/Scenes/SampleScene.unity
+++ b/box1/Assets/Scenes/SampleScene.unity
@ -495,6 +495,147 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1066086290
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1066086292}
+  - component: {fileID: 1066086291}
+  m_Layer: 0
+  m_Name: AdMgr
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1066086291
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1066086290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce9e131c48914344cb9f2434d4e52043, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1066086292
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1066086290}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 219.1308, y: 431.37006, z: -8.007305}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1731515871
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6587181790795372619, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
+      propertyPath: m_Name
+      value: Canvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
 --- !u!114 &1780252781 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 1508046071943503871, guid: ea4aa1b96b53e65448173fee944b8f71, type: 3}
@ -619,119 +760,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1541394271929653118
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 259154952757479588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 452510549046969587, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 452510549046969587, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5601368613170975588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5601368613170975588, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6587181790795372619, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
-      propertyPath: m_Name
-      value: Canvas
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bc915903b2ea8634f8eb7590222c05b0, type: 3}
 --- !u!1001 &1988479874287744756
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1714,7 +1742,7 @@ SceneRoots:
  m_Roots:
  - {fileID: 519420032}
  - {fileID: 619394802}
-  - {fileID: 1541394271929653118}
+  - {fileID: 1731515871}
  - {fileID: 2065864012}
  - {fileID: 6350540495189884974}
  - {fileID: 1988479874287744756}
@ -1722,3 +1750,4 @@ SceneRoots:
  - {fileID: 512490667}
  - {fileID: 2085940120}
  - {fileID: 2473429094783586364}
+  - {fileID: 1066086292}
--- a/box1/Assets/Script/GameManager.cs
+++ b/box1/Assets/Script/GameManager.cs
@ -331,10 +331,10 @@ public class GameManager : MonoBehaviour
                ItemSystem.ins.ResetItemOrder();
                stopGrid = null;
                seletObj = null;
-                if (ItemSystem.ins.WaitGridIsNull())
-                {
-                    StartCoroutine(ItemSystem.ins.AddNewItem());
-                }
+                // if (ItemSystem.ins.WaitGridIsNull())
+                // {
+                //     StartCoroutine(ItemSystem.ins.AddNewItem());
+                // }
                MapManager.ins.ResetAnimation();
                ResetPropattributes();
            }
--- a/box1/Assets/Script/UI/LevelPanel.cs
+++ b/box1/Assets/Script/UI/LevelPanel.cs
@ -175,7 +175,6 @@ public class LevelPanel : MonoBehaviour
            }
            index++;
        }
-
        ResetButton();
        SetTaskDisplay(levelID);
        var bdata= JsonTab.Instance.tables.Level.Get(levelID);
@ -186,7 +185,6 @@ public class LevelPanel : MonoBehaviour
        {
            nextDatas = bChapter;
        }
-
        if (nextDatas==null)
        {
            dowButton.gameObject.SetActive(false);
--- a/box1/Assets/Script/UI/MainPanel.cs
+++ b/box1/Assets/Script/UI/MainPanel.cs
@ -19,12 +19,6 @@ public class MainPanel : MonoBehaviour
    [SerializeField] private TourPanel tourPanel;//旅行界面
    [SerializeField] private HomePanel homePanel;//家园界面
    [SerializeField] private RankListPanel rankPanel;
-    [SerializeField] private Button winrestButton;
-    [SerializeField] private Button wincloseButton;
-    [SerializeField] private Button loseRestButton;
-    [SerializeField] private Button loseCloseButton;
-
-    [SerializeField] private TextMeshProUGUI _textMeshPro;

    private void Awake()
    {
--- a/box1/Assets/Script/UI/TourPanel.cs
+++ b/box1/Assets/Script/UI/TourPanel.cs
@ -196,8 +196,11 @@ public class TourPanel : MonoBehaviour
        }
        else
        {
-            DataManager.SetInt("GetTimeScale",1);
-            timeScale = 3;
+            AdMgr.Instance.ShowAd((a)=>
+            {
+                DataManager.SetInt("GetTimeScale",1);
+                timeScale = 3;
+            });
        }
    }

--- a/box1/Assets/Script/UI/WinPanel.cs
+++ b/box1/Assets/Script/UI/WinPanel.cs
@ -93,7 +93,7 @@ public class WinPanel : MonoBehaviour
        {
            var lastPoints=DataManager.LastTimePoints(GameManager.ins.level)*2;
            DataManager.SetPointsData(GameManager.ins.level, lastPoints);
-            SaveTTEvent();
+            //SaveTTEvent();
            DataManager.STTAnalytics("Double",DataManager.GTTAnalytics("Double")+1);
            switch (DataManager.GTTAnalytics("Double"))
            {
@ -144,7 +144,7 @@ public class WinPanel : MonoBehaviour

    void CloseEvent()
    {
+        Debug.Log("CloseEvent");
        MainPanel.ins.ClosePanelEvent();
-        SaveTTEvent();
    }
 }
--- a/box1/ProjectSettings/ProjectSettings.asset
+++ b/box1/ProjectSettings/ProjectSettings.asset
@ -4,7 +4,7 @@
 PlayerSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 26
-  productGUID: 4fb1ff328aa1b954aba52c870c43a3de
+  productGUID: 5d71eb9d4f80d844bb139f6cd8239a67
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  AndroidEnableSustainedPerformanceMode: 0
@ -16,7 +16,7 @@ PlayerSettings:
  productName: box1
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
-  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
+  m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1}
  m_ShowUnitySplashScreen: 1
  m_ShowUnitySplashLogo: 1
  m_SplashScreenOverlayOpacity: 1
@ -160,9 +160,7 @@ PlayerSettings:
  resetResolutionOnWindowResize: 0
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
-  applicationIdentifier:
-    Android: com.DefaultCompany.box1
-    Standalone: com.DefaultCompany.box1
+  applicationIdentifier: {}
  buildNumber:
    Standalone: 0
    VisionOS: 0
@ -174,7 +172,7 @@ PlayerSettings:
  AndroidTargetSdkVersion: 0
  AndroidPreferredInstallLocation: 1
  aotOptions: 
-  stripEngineCode: 0
+  stripEngineCode: 1
  iPhoneStrippingLevel: 0
  iPhoneScriptCallOptimization: 0
  ForceInternetPermission: 0
@ -249,9 +247,9 @@ PlayerSettings:
  iOSAutomaticallyDetectAndAddCapabilities: 1
  appleEnableProMotion: 0
  shaderPrecisionModel: 0
-  clonedFromGUID: c19f32bac17ee4170b3bf8a6a0333fb9
-  templatePackageId: com.unity.template.universal-2d@2.1.2
-  templateDefaultScene: Assets/Scenes/SampleScene.unity
+  clonedFromGUID: 00000000000000000000000000000000
+  templatePackageId: 
+  templateDefaultScene: 
  useCustomMainManifest: 0
  useCustomLauncherManifest: 0
  useCustomMainGradleTemplate: 0
@ -260,7 +258,7 @@ PlayerSettings:
  useCustomGradlePropertiesTemplate: 0
  useCustomGradleSettingsTemplate: 0
  useCustomProguardFile: 0
-  AndroidTargetArchitectures: 3
+  AndroidTargetArchitectures: 1
  AndroidTargetDevices: 0
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
@ -283,101 +281,9 @@ PlayerSettings:
  AndroidMinifyRelease: 0
  AndroidMinifyDebug: 0
  AndroidValidateAppBundleSize: 1
-  AndroidAppBundleSizeToValidate: 150
+  AndroidAppBundleSizeToValidate: 200
  m_BuildTargetIcons: []
  m_BuildTargetPlatformIcons:
-  - m_BuildTarget: Android
-    m_Icons:
-    - m_Textures: []
-      m_Width: 432
-      m_Height: 432
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 324
-      m_Height: 324
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 216
-      m_Height: 216
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 162
-      m_Height: 162
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 108
-      m_Height: 108
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 81
-      m_Height: 81
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 0
-      m_SubKind: 
  - m_BuildTarget: iPhone
    m_Icons:
    - m_Textures: []
@ -475,6 +381,98 @@ PlayerSettings:
      m_Height: 1024
      m_Kind: 4
      m_SubKind: App Store
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
  m_BuildTargetBatching: []
  m_BuildTargetShaderSettings: []
  m_BuildTargetGraphicsJobs: []
@ -483,9 +481,6 @@ PlayerSettings:
  - m_BuildTarget: WebGLSupport
    m_APIs: 0b000000
    m_Automatic: 0
-  - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 02000000
-    m_Automatic: 1
  m_BuildTargetVRSettings: []
  m_DefaultShaderChunkSizeInMB: 16
  m_DefaultShaderChunkCount: 0
@ -495,6 +490,7 @@ PlayerSettings:
  m_TemplateCustomTags: {}
  mobileMTRendering:
    Android: 1
+    VisionOS: 1
    iPhone: 1
    tvOS: 1
  m_BuildTargetGroupLightmapEncodingQuality: []
@ -638,7 +634,7 @@ PlayerSettings:
  switchSystemResourceMemory: 16777216
  switchSupportedNpadStyles: 22
  switchNativeFsCacheSize: 32
-  switchIsHoldTypeHorizontal: 0
+  switchIsHoldTypeHorizontal: 1
  switchSupportedNpadCount: 8
  switchEnableTouchScreen: 1
  switchSocketConfigEnabled: 0
@ -651,7 +647,7 @@ PlayerSettings:
  switchSocketBufferEfficiency: 4
  switchSocketInitializeEnabled: 1
  switchNetworkInterfaceManagerInitializeEnabled: 1
-  switchUseNewStyleFilepaths: 0
+  switchUseNewStyleFilepaths: 1
  switchUseLegacyFmodPriorities: 0
  switchUseMicroSleepForYield: 1
  switchEnableRamDiskSupport: 0
@ -697,7 +693,7 @@ PlayerSettings:
  ps4GarlicHeapSize: 2048
  ps4ProGarlicHeapSize: 2560
  playerPrefsMaxSize: 32768
-  ps4Passcode: D25bFOIlcWmANChRvUT1ao3Ud48vHsjc
+  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
  ps4pnSessions: 1
  ps4pnPresence: 1
  ps4pnFriends: 1
@ -760,30 +756,13 @@ PlayerSettings:
  webGLMemoryGeometricGrowthStep: 0.2
  webGLMemoryGeometricGrowthCap: 96
  webGLPowerPreference: 2
-  scriptingDefineSymbols:
-    WebGL: SE_DG
+  scriptingDefineSymbols: {}
  additionalCompilerArguments: {}
  platformArchitecture: {}
-  scriptingBackend:
-    Android: 1
+  scriptingBackend: {}
  il2cppCompilerConfiguration: {}
-  il2cppCodeGeneration:
-    WebGL: 1
-  managedStrippingLevel:
-    EmbeddedLinux: 1
-    GameCoreScarlett: 1
-    GameCoreXboxOne: 1
-    Nintendo Switch: 1
-    PS4: 1
-    PS5: 1
-    QNX: 1
-    Stadia: 1
-    VisionOS: 1
-    WebGL: 1
-    Windows Store Apps: 1
-    XboxOne: 1
-    iPhone: 1
-    tvOS: 1
+  il2cppCodeGeneration: {}
+  managedStrippingLevel: {}
  incrementalIl2cppBuild: {}
  suppressCommonWarnings: 1
  allowUnsafeCode: 0
--- a/box1/UserSettings/Layouts/default-2022.dwlt
+++ b/box1/UserSettings/Layouts/default-2022.dwlt
@ -121,7 +121,7 @@ MonoBehaviour:
  m_MinSize: {x: 810, y: 721}
  m_MaxSize: {x: 4000, y: 4021}
  vertical: 0
-  controlID: 11281
+  controlID: 147
  draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@ -198,7 +198,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 100}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 177
+  controlID: 138
  draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@ -219,8 +219,8 @@ MonoBehaviour:
    y: 0
    width: 368
    height: 923
-  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: 22}
  m_Panes:
  - {fileID: 22}
@ -244,9 +244,9 @@ MonoBehaviour:
    x: 0
    y: 0
    width: 361
-    height: 536
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    height: 441
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 23}
  m_Panes:
  - {fileID: 23}
@ -262,23 +262,23 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 536
+    y: 441
    width: 1536
-    height: 387
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 21}
+    height: 482
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 25}
  m_Panes:
  - {fileID: 21}
  - {fileID: 25}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -374,7 +374,7 @@ MonoBehaviour:
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 102
+  controlID: 41
  draggingID: 0
 --- !u!114 &16
 MonoBehaviour:
@ -396,11 +396,11 @@ MonoBehaviour:
    x: 0
    y: 0
    width: 1536
-    height: 536
+    height: 441
  m_MinSize: {x: 200, y: 50}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 103
+  controlID: 42
  draggingID: 0
 --- !u!114 &17
 MonoBehaviour:
@ -420,9 +420,9 @@ MonoBehaviour:
    x: 361
    y: 0
    width: 1175
-    height: 536
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    height: 441
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 24}
  m_Panes:
  - {fileID: 24}
@ -643,9 +643,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 8
-    y: 617
+    y: 522
    width: 1535
-    height: 366
+    height: 461
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
@ -667,24 +667,24 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Art/UI/TourPanel
+    - Assets/Script/UI
    m_Globs: []
    m_OriginalText: 
    m_ImportLogFlags: 0
    m_FilterByTypeIntersection: 0
  m_ViewMode: 1
-  m_StartGridSize: 96
+  m_StartGridSize: 16
  m_LastFolders:
-  - Assets/Art/UI/TourPanel
-  m_LastFoldersGridSize: 96
-  m_LastProjectPath: E:\UnityProject\Game\box1
+  - Assets/Script/UI
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: E:\Project\WXGame\box1
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 230}
-    m_SelectedIDs: 02910200
-    m_LastClickedID: 168194
-    m_ExpandedIDs: 00000000429800004498000050980000a0980000be98000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 175}
+    m_SelectedIDs: 7e880000
+    m_LastClickedID: 34942
+    m_ExpandedIDs: 00000000b6860000b8860000ba8600004488000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -712,7 +712,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 
+    m_ExpandedIDs: 00000000b6860000b8860000ba860000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -739,8 +739,8 @@ MonoBehaviour:
  m_ListAreaState:
    m_SelectedInstanceIDs: 
    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000448600003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000ce7700002ea800005ea80000006700001a7b0000187b0000107a0000c27900001ceb0000ea7a0000e07a0000d4c70000967e0000767f0000d67f0000c07d0000b4630000547d0000e87d00003a7d000000000000a4b5000024b700008e7d000084630100627d0000647d0000
+    m_HadKeyboardFocusLastEvent: 0
+    m_ExpandedInstanceIDs: c6230000448600003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000ce7700002ea800005ea80000006700001a7b0000187b0000107a0000c27900001ceb0000ea7a0000e07a0000d4c70000967e0000767f0000d67f0000c07d0000b4630000547d0000e87d00003a7d000000000000a4b5000024b700008e7d00001c72000078740000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -764,8 +764,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
    m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 288.5}
-    m_GridSize: 96
+    m_ScrollPosition: {x: 0, y: 0}
+    m_GridSize: 16
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 207
 --- !u!114 &22
@ -805,11 +805,11 @@ MonoBehaviour:
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
  m_PreviewResizer:
-    m_CachedPref: 151
+    m_CachedPref: 186
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 162
+  m_LastVerticalScrollValue: 206
  m_GlobalObjectId: 
  m_InspectorMode: 0
  m_LockTracker:
@ -838,7 +838,7 @@ MonoBehaviour:
    x: 8
    y: 81
    width: 360
-    height: 515
+    height: 420
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
@ -854,7 +854,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 3094fcffac94fcfff2affcff40f1feff8af1feffd00cfffffee5ffff10e6ffff56efffff8cf2ffff7ef5ffff16fbffffa65501000a59010012620100
+      m_ExpandedIDs: 16fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -901,7 +901,7 @@ MonoBehaviour:
    x: 369
    y: 81
    width: 1173
-    height: 515
+    height: 420
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
@ -1273,9 +1273,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 510.46848, y: 679.2143, z: -4.5234733}
+    m_Target: {x: 219.1308, y: 431.37006, z: -8.007305}
    speed: 2
-    m_Value: {x: 510.46848, y: 679.2143, z: -4.5234733}
+    m_Value: {x: 219.1308, y: 431.37006, z: -8.007305}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -1325,9 +1325,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 474.26102
+    m_Target: 944.0689
    speed: 2
-    m_Value: 474.26102
+    m_Value: 944.0689
  m_Ortho:
    m_Target: 1
    speed: 2
@ -1373,9 +1373,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 8
-    y: 617
+    y: 522
    width: 1535
-    height: 366
+    height: 461
  m_SerializedDataModeController:
    m_DataMode: 0
    m_PreferredDataMode: 0
--- a/box1/project.config.json
+++ b/box1/project.config.json
@ -1 +1 @@
-{"appid":"tt2f5a59e7b06fb35a07","projectname":"box1","unity":{"build":{"webgl":"E:\\Project\\apk\\BoxDY\\webgl_package-20241220_150858.zip","native":{"il2cpp":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\il2cppOutput.zip","apk":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\launcher-release.apk","fullApk":""},"instantGame":""},"publishType":"2","starkSdkVersion":"Without StarkSDK","unityToolsVersion":"4.0.4","unityEngineVersion":"2022.3.44f1c1","arch":"both"}}
+{"appid":"tt2f5a59e7b06fb35a07","projectname":"box1","unity":{"build":{"webgl":"E:\\Project\\apk\\BoxDY\\webgl_package-20241228_182428.zip","native":{"il2cpp":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\il2cppOutput.zip","apk":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\launcher-release.apk","fullApk":""},"instantGame":""},"publishType":"2","starkSdkVersion":"Without StarkSDK","unityToolsVersion":"4.0.4","unityEngineVersion":"2022.3.44f1c1","arch":"both"}}