From 1d1ea4488c2e60d562f2afa3c108d9dddb621b81 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Wed, 4 Feb 2026 23:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E7=89=88=E7=9F=B3=E5=A4=B4=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AddressableAssetSettings.asset | 2 +-
.../AssetGroups/Default Local Group.asset | 5 +
.../Editor/Inspector/GridVisualizerEditor.cs | 18 +-
Assets/Prefabs/BlockPuzzle/BlockShape.prefab | 14 +-
.../BlockPuzzle/引擎组件/共鸣腔.prefab | 13 +
.../BlockPuzzle/引擎组件/动平衡飞轮组.prefab | 13 +
.../BlockPuzzle/引擎组件/惯性稳压器.prefab | 67 +-
.../BlockPuzzle/引擎组件/散热条.prefab | 53 +-
.../BlockPuzzle/引擎组件/散热系统.prefab | 53 +-
.../BlockPuzzle/引擎组件/新动力核心.prefab | 13 +
.../BlockPuzzle/引擎组件/旧动力核心.prefab | 13 +
.../BlockPuzzle/引擎组件/辅助涡轮.prefab | 13 +
.../BlockPuzzle/引擎组件/进气系统.prefab | 13 +
.../FixSystemPrefabs/Block Puzzle Game.prefab | 1830 ++++-------------
.../网格拼图相关素材/石头动力模块维修界面.psd | 4 +-
.../石头动力模块维修界面.psd.meta | 59 +-
Assets/Scenes/网格测试.unity | 1302 ++----------
.../BlockPuzzleValidtor/引擎室规则.asset | 19 +-
.../Screen System/FixPanel/BlockPuzzlePart.cs | 47 +-
.../Screen System/UniversalScreen.cs | 1 -
.../BlockPuzzle/Class/BlockPuzzleGrid.cs | 8 -
.../BlockPuzzle/Class/BlockPuzzleKit.cs | 68 +
.../BlockPuzzle/Class/BlockPuzzlePanel.cs | 37 +-
.../BlockPuzzle/Class/BlockPuzzleSystem.cs | 144 +-
.../BlockPuzzle/Class/BlockPuzzleValidator.cs | 48 +-
.../MiniGame/BlockPuzzle/Class/BlockShape.cs | 2 -
.../BlockPuzzle/Class/GridVisualizer.cs | 15 +-
.../BlockPuzzle/Class/PlacementValidator.cs | 13 +-
.../BlockPuzzle/Class/ShapeDragger.cs | 2 +
.../BlockPuzzle/Class/ShapeFactory.cs | 15 +
.../BlockPuzzle/Class/ShapeRecycleSlot.cs | 17 +-
.../Class/UIHander/BlockSubmitHander.cs | 53 +
.../Class/UIHander/BlockSubmitHander.cs.meta | 11 +
.../Components}/SignLightHandler.cs | 0
.../Components}/SignLightHandler.cs.meta | 0
Assets/Scripts/UI/UIKit.cs | 10 +
Assets/Scripts/Utility/JsonUtil.cs | 32 +-
.../LevelData/BlockPuzzle/BlockShapeInfo.json | 81 +-
38 files changed, 1421 insertions(+), 2687 deletions(-)
create mode 100644 Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs
create mode 100644 Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs.meta
rename Assets/Scripts/{MiniGame/BlockPuzzle/Class/UIHander => UI/Components}/SignLightHandler.cs (100%)
rename Assets/Scripts/{MiniGame/BlockPuzzle/Class/UIHander => UI/Components}/SignLightHandler.cs.meta (100%)
diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
index 24e29e0ca..436e533c2 100644
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 09546aca93a801441859af2a811fe53b
m_currentHash:
serializedVersion: 2
- Hash: b53f304e2338ce70db1045411843d66c
+ Hash: 23f8c5ccd7cce25d443750000db64bc9
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
index a3d3c00d1..57cac31cb 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -72,6 +72,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 0519c41f06740d64390437a889eee2d9
+ m_Address: "BlockPuzzle/\u6309\u94AE\u7F29\u7565\u56FE"
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
diff --git a/Assets/Editor/Inspector/GridVisualizerEditor.cs b/Assets/Editor/Inspector/GridVisualizerEditor.cs
index 8f460aea7..a0c442964 100644
--- a/Assets/Editor/Inspector/GridVisualizerEditor.cs
+++ b/Assets/Editor/Inspector/GridVisualizerEditor.cs
@@ -6,14 +6,26 @@ namespace AibisDream.SystemEditor
[CustomEditor(typeof(GridVisualizer))]
public class GridVisualizerEditor : Editor
{
+ private SerializedProperty sortingLayerProperty;
+ private SerializedProperty sortingOrderProperty;
+
+ private void OnEnable()
+ {
+ sortingLayerProperty = serializedObject.FindProperty("sortingLayer");
+ sortingOrderProperty = serializedObject.FindProperty("sortingOrder");
+ }
+
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
- var example = (GridVisualizer)target;
+ serializedObject.Update();
+
EditorGUILayout.LabelField("层级设置", EditorStyles.boldLabel);
- example.sortingLayer = EditorKit.SortingLayerField("目标层级", example.sortingLayer);
- example.sortingOrder = EditorGUILayout.IntField("层级顺序", example.sortingOrder);
+ EditorKit.SortingLayerField(new GUIContent("目标层级"), sortingLayerProperty);
+ EditorGUILayout.PropertyField(sortingOrderProperty, new GUIContent("层级顺序"));
+
+ serializedObject.ApplyModifiedProperties();
}
}
}
\ No newline at end of file
diff --git a/Assets/Prefabs/BlockPuzzle/BlockShape.prefab b/Assets/Prefabs/BlockPuzzle/BlockShape.prefab
index bdfd52ecd..8e02b8ea2 100644
--- a/Assets/Prefabs/BlockPuzzle/BlockShape.prefab
+++ b/Assets/Prefabs/BlockPuzzle/BlockShape.prefab
@@ -13,7 +13,6 @@ GameObject:
- component: {fileID: 1224845219232276460}
- component: {fileID: 4646419983055809048}
- component: {fileID: 4283988294842430357}
- - component: {fileID: 8308584449185143604}
m_Layer: 0
m_Name: BlockShape
m_TagString: Untagged
@@ -68,6 +67,7 @@ MonoBehaviour:
shapeDescription:
states: []
buttonImagePath:
+ detailImagePath:
--- !u!60 &1224845219232276460
PolygonCollider2D:
m_ObjectHideFlags: 0
@@ -179,15 +179,3 @@ MonoBehaviour:
dragLayerOrder: 25
idleLayerId: 1134468525
idleLayerOrder: 11
---- !u!210 &8308584449185143604
-SortingGroup:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1355800832498282156}
- m_Enabled: 1
- m_SortingLayerID: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 0
- m_SortAtRoot: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/共鸣腔.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/共鸣腔.prefab
index 8e509a58f..e301bf643 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/共鸣腔.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/共鸣腔.prefab
@@ -93,6 +93,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8033066979870906055}
+ - component: {fileID: 3407210902441740410}
m_Layer: 0
m_Name: "\u5171\u9E23\u8154"
m_TagString: Untagged
@@ -118,6 +119,18 @@ Transform:
- {fileID: 2777847432519987012}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &3407210902441740410
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5189088947080543749}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
--- !u!1 &6516789740179254263
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/动平衡飞轮组.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/动平衡飞轮组.prefab
index e8fb6cb2f..ab75c7815 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/动平衡飞轮组.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/动平衡飞轮组.prefab
@@ -429,6 +429,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1219879511032645539}
+ - component: {fileID: 4679671145176646940}
m_Layer: 0
m_Name: "\u52A8\u5E73\u8861\u98DE\u8F6E\u7EC4"
m_TagString: Untagged
@@ -461,6 +462,18 @@ Transform:
- {fileID: 3972042556459422518}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &4679671145176646940
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6540296062082269002}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
--- !u!1 &6726549844697620442
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/惯性稳压器.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/惯性稳压器.prefab
index 5c5088a07..3c9be221e 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/惯性稳压器.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/惯性稳压器.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &8798820299727595205
+--- !u!1 &1444101771948321629
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,37 +8,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1333018235521955266}
- - component: {fileID: 6942524670884740071}
+ - component: {fileID: 3013593665482770009}
+ - component: {fileID: 3486306133740348940}
m_Layer: 0
- m_Name: "\u60EF\u6027\u7A33\u538B\u5668"
+ m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1333018235521955266
+--- !u!4 &3013593665482770009
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8798820299727595205}
+ m_GameObject: {fileID: 1444101771948321629}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.585, y: 0.585, z: 0}
+ 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: 0}
+ m_Father: {fileID: 1333018235521955266}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6942524670884740071
+--- !u!212 &3486306133740348940
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8798820299727595205}
+ m_GameObject: {fileID: 1444101771948321629}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -84,3 +84,48 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &8798820299727595205
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1333018235521955266}
+ - component: {fileID: 4889412042225234040}
+ m_Layer: 0
+ m_Name: "\u60EF\u6027\u7A33\u538B\u5668"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1333018235521955266
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8798820299727595205}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.585, y: 0.585, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 3013593665482770009}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &4889412042225234040
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8798820299727595205}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/散热条.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/散热条.prefab
index 229bbcbfa..cad4e489d 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/散热条.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/散热条.prefab
@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3103684059536612534}
- - component: {fileID: 7891746101094893876}
+ - component: {fileID: 8023670165185557050}
m_Layer: 0
m_Name: "\u6563\u70ED\u6761"
m_TagString: Untagged
@@ -29,17 +29,62 @@ Transform:
m_LocalPosition: {x: 1.755, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 5891729032255803302}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7891746101094893876
-SpriteRenderer:
+--- !u!210 &8023670165185557050
+SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2459254411633306081}
m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
+--- !u!1 &6837666022557684452
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5891729032255803302}
+ - component: {fileID: 3190295386551606174}
+ m_Layer: 0
+ m_Name: "\u6563\u70ED\u6761"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5891729032255803302
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6837666022557684452}
+ serializedVersion: 2
+ 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: 3103684059536612534}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &3190295386551606174
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6837666022557684452}
+ m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/散热系统.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/散热系统.prefab
index b87361e5b..0dbd8b72e 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/散热系统.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/散热系统.prefab
@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4003383592530614652}
- - component: {fileID: 4540708111873067341}
+ - component: {fileID: 4034973304588068555}
m_Layer: 0
m_Name: "\u6563\u70ED\u7CFB\u7EDF"
m_TagString: Untagged
@@ -29,17 +29,62 @@ Transform:
m_LocalPosition: {x: 1.17, y: 0.585, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 566472679620608657}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &4540708111873067341
-SpriteRenderer:
+--- !u!210 &4034973304588068555
+SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 172036340797654731}
m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
+--- !u!1 &7018008495298836964
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 566472679620608657}
+ - component: {fileID: 6750360120797687883}
+ m_Layer: 0
+ m_Name: "\u6563\u70ED\u7CFB\u7EDF"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &566472679620608657
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7018008495298836964}
+ serializedVersion: 2
+ 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: 4003383592530614652}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &6750360120797687883
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7018008495298836964}
+ m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/新动力核心.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/新动力核心.prefab
index c6fefddd3..912abddd0 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/新动力核心.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/新动力核心.prefab
@@ -93,6 +93,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8950552191398444585}
+ - component: {fileID: 7213596409072140752}
m_Layer: 0
m_Name: "\u65B0\u52A8\u529B\u6838\u5FC3"
m_TagString: Untagged
@@ -117,6 +118,18 @@ Transform:
- {fileID: 1373797842777019686}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &7213596409072140752
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4905377015707044745}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
--- !u!1 &8583653343740636636
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/旧动力核心.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/旧动力核心.prefab
index 229c85189..564820068 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/旧动力核心.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/旧动力核心.prefab
@@ -93,6 +93,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6944742323572982583}
+ - component: {fileID: 7505792561260385530}
m_Layer: 0
m_Name: "\u65E7\u52A8\u529B\u6838\u5FC3"
m_TagString: Untagged
@@ -118,6 +119,18 @@ Transform:
- {fileID: 32864910298448052}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &7505792561260385530
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4507972502512266135}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
--- !u!1 &4899262883552945804
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/辅助涡轮.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/辅助涡轮.prefab
index 13db333f4..689f88ad4 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/辅助涡轮.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/辅助涡轮.prefab
@@ -177,6 +177,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9127022540097516158}
+ - component: {fileID: 9127173804116326207}
m_Layer: 0
m_Name: "\u8F85\u52A9\u6DA1\u8F6E"
m_TagString: Untagged
@@ -201,3 +202,15 @@ Transform:
- {fileID: 194806414261741644}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &9127173804116326207
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6137923525990552215}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
diff --git a/Assets/Prefabs/BlockPuzzle/引擎组件/进气系统.prefab b/Assets/Prefabs/BlockPuzzle/引擎组件/进气系统.prefab
index 06b9b56ad..1487a8b2b 100644
--- a/Assets/Prefabs/BlockPuzzle/引擎组件/进气系统.prefab
+++ b/Assets/Prefabs/BlockPuzzle/引擎组件/进气系统.prefab
@@ -177,6 +177,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8164154881897081106}
+ - component: {fileID: 6326437728626410913}
m_Layer: 0
m_Name: "\u8FDB\u6C14\u7CFB\u7EDF"
m_TagString: Untagged
@@ -202,6 +203,18 @@ Transform:
- {fileID: 8626455257342477063}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!210 &6326437728626410913
+SortingGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7198766400001509568}
+ m_Enabled: 1
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 10
+ m_SortAtRoot: 0
--- !u!1 &8726264211696304123
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/FixSystemPrefabs/Block Puzzle Game.prefab b/Assets/Prefabs/FixSystemPrefabs/Block Puzzle Game.prefab
index f8dbabdf4..9b7ddcf77 100644
--- a/Assets/Prefabs/FixSystemPrefabs/Block Puzzle Game.prefab
+++ b/Assets/Prefabs/FixSystemPrefabs/Block Puzzle Game.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &856747765937572932
+--- !u!1 &639863175006192423
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,75 +8,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1499443718145266889}
+ - component: {fileID: 2090957857687988833}
+ - component: {fileID: 6462385237761732875}
m_Layer: 0
- m_Name: "\u7EC4\u4EF6\u6839\u8282\u70B9"
+ m_Name: "\u62BD\u5C49AO\u95ED\u585E\u9634\u5F71"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1499443718145266889
+--- !u!4 &2090957857687988833
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 856747765937572932}
- serializedVersion: 2
- 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: 1850838185036216328}
- - {fileID: 5029250324497363592}
- - {fileID: 8042892741277654623}
- - {fileID: 2039564007509823948}
- - {fileID: 438179655612810879}
- - {fileID: 6952241498726885718}
- - {fileID: 7203917669022731298}
- m_Father: {fileID: 1133554645891563439}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1985038537414273809
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1862300142758591214}
- - component: {fileID: 1372856441920777658}
- m_Layer: 0
- m_Name: "\u5916\u58F3"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1862300142758591214
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1985038537414273809}
+ m_GameObject: {fileID: 639863175006192423}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -1.6697679, y: 0, z: 0}
+ m_LocalPosition: {x: 0.93023205, y: 0.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 7628860540720484160}
+ m_Father: {fileID: 5779712598771319248}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1372856441920777658
+--- !u!212 &6462385237761732875
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1985038537414273809}
+ m_GameObject: {fileID: 639863175006192423}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -108,21 +70,21 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 2
- m_Sprite: {fileID: -1530906182191096996, guid: 72410d87269b9d54ebd2e54718039746, type: 3}
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 20
+ m_Sprite: {fileID: -7616958423233772794, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 14.52093, y: 10.046512}
+ m_Size: {x: 3.5348837, y: 5.2093024}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &1997755591233928732
+--- !u!1 &856747765937572932
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -130,66 +92,68 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8042892741277654623}
- - component: {fileID: 1919777290943761040}
- - component: {fileID: 5607944879656607012}
- - component: {fileID: 6782602204973003163}
- - component: {fileID: 6797786636534398525}
- - component: {fileID: 6510573679078750269}
+ - component: {fileID: 1499443718145266889}
m_Layer: 0
- m_Name: "\u65E7\u5F0F\u91CD\u578B\u5F15\u64CE"
+ m_Name: "\u7EC4\u4EF6\u6839\u8282\u70B9"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &8042892741277654623
+--- !u!4 &1499443718145266889
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997755591233928732}
+ m_GameObject: {fileID: 856747765937572932}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.565, y: 1.2549996, z: 0}
+ 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: 1499443718145266889}
+ m_Father: {fileID: 1133554645891563439}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1919777290943761040
-MonoBehaviour:
+--- !u!1 &1872646530038954453
+GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997755591233928732}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u65E7\u5F0F\u91CD\u578B\u5F15\u64CE"
- width: 4
- height: 3
- cellSize: 1.17
- originalPatternStr: 1,1,1;1,1,1;1,1,1;1,1,1
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u65E7\u5F0F\u91CD\u578B\u5F15\u64CE]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &5607944879656607012
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6640144315775818586}
+ - component: {fileID: 105714318639942454}
+ m_Layer: 0
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6640144315775818586
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1872646530038954453}
+ serializedVersion: 2
+ 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: 5314670846670034778}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &105714318639942454
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997755591233928732}
+ m_GameObject: {fileID: 1872646530038954453}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -203,7 +167,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+ - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -221,131 +185,20 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: 4926554255740280818, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
+ m_SortingLayerID: 1034535805
+ m_SortingLayer: 9
+ m_SortingOrder: 1
+ m_Sprite: {fileID: -5149185653679605778, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 2, y: 3}
+ m_Size: {x: 17.860466, y: 10.046512}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!60 &6782602204973003163
-PolygonCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997755591233928732}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.125, y: 0.167}
- oldSize: {x: 4.6325583, y: 3.4418604}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: -0.585, y: -0.585}
- - {x: 4.095, y: -0.585}
- - {x: 4.095, y: 2.925}
- - {x: -0.585, y: 2.925}
- m_UseDelaunayMesh: 0
---- !u!114 &6797786636534398525
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997755591233928732}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &6510573679078750269
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997755591233928732}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
--- !u!1 &2043302596547163396
GameObject:
m_ObjectHideFlags: 0
@@ -462,232 +315,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &2234235524907542922
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6952241498726885718}
- - component: {fileID: 7998635807216191728}
- - component: {fileID: 7061798174677879753}
- - component: {fileID: 3792984488553823719}
- - component: {fileID: 3519558193327086935}
- - component: {fileID: 2883728548053655863}
- m_Layer: 0
- m_Name: "\u8FDB\u6C14\u7CFB\u7EDF"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6952241498726885718
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2234235524907542922}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.2250001, y: -3.4250002, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1499443718145266889}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7998635807216191728
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2234235524907542922}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u8FDB\u6C14\u7CFB\u7EDF"
- width: 2
- height: 2
- cellSize: 1.17
- originalPatternStr: 1,1;0,1
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u8FDB\u6C14\u7CFB\u7EDF]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &7061798174677879753
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2234235524907542922}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -8406782090819627767, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 2, y: 3}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!60 &3792984488553823719
-PolygonCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2234235524907542922}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.25, y: 0.25}
- oldSize: {x: 2.3162792, y: 2.3069768}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: -0.585, y: -0.585}
- - {x: 0.585, y: -0.585}
- - {x: 0.585, y: 0.585}
- - {x: 1.7549999, y: 0.585}
- - {x: 1.7549999, y: 1.7549999}
- - {x: -0.585, y: 1.7549999}
- m_UseDelaunayMesh: 0
---- !u!114 &3519558193327086935
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2234235524907542922}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &2883728548053655863
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2234235524907542922}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
--- !u!1 &2343822804118529033
GameObject:
m_ObjectHideFlags: 0
@@ -762,7 +389,7 @@ MonoBehaviour:
cellMaterial: {fileID: 0}
sortingLayer: 0
sortingOrder: 0
---- !u!1 &2824281136311423526
+--- !u!1 &3053584644542009837
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -770,69 +397,94 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1850838185036216328}
- - component: {fileID: 4769942882389064517}
- - component: {fileID: 2126526275774923873}
- - component: {fileID: 6527559192278936900}
- - component: {fileID: 3464626690849612721}
- - component: {fileID: 2157738590523074599}
+ - component: {fileID: 1010688890868033682}
+ - component: {fileID: 5821461881795384241}
m_Layer: 0
- m_Name: "\u60EF\u6027\u7A33\u538B\u5668"
+ m_Name: "\u56DE\u6536\u69FD\u4F4D"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1850838185036216328
+--- !u!4 &1010688890868033682
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2824281136311423526}
+ m_GameObject: {fileID: 3053584644542009837}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.565, y: -3.4250002, z: 0}
+ m_LocalPosition: {x: 6.78, y: -2.65, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1499443718145266889}
+ m_Children:
+ - {fileID: 5779712598771319248}
+ - {fileID: 982752880096938688}
+ - {fileID: 6779997479549439809}
+ - {fileID: 2311446353309964274}
+ - {fileID: 5099443447835133409}
+ - {fileID: 7968244780405505479}
+ m_Father: {fileID: 1133554645891563439}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4769942882389064517
+--- !u!114 &5821461881795384241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2824281136311423526}
+ m_GameObject: {fileID: 3053584644542009837}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
+ m_Script: {fileID: 11500000, guid: c2a72a6db090d2e40a34ae7627d36a7e, type: 3}
m_Name:
m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u60EF\u6027\u7A33\u538B\u5668"
- width: 2
- height: 2
- cellSize: 1.17
- originalPatternStr: 1,1;1,1
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u60EF\u6027\u7A33\u538B\u5668]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &2126526275774923873
-SpriteRenderer:
+ mover: {fileID: 1017267867930230067}
+ halfArea: {fileID: 1087829019175070639}
+ openArea: {fileID: 1939276753096450851}
+ attachPoint: {fileID: 5674932156508469889}
+--- !u!1 &3655425890358533180
+GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2824281136311423526}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6649725243761466404}
+ - component: {fileID: 5149654153212050437}
+ m_Layer: 0
+ m_Name: "\u8FB9\u6846\u906E\u7F69"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6649725243761466404
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3655425890358533180}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -2.476745, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 5314670846670034778}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &5149654153212050437
+SpriteMask:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3655425890358533180}
m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
@@ -843,7 +495,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+ - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -856,137 +508,25 @@ SpriteRenderer:
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
+ m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -294367964174721111, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 2, y: 3}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: -6108097492665087018, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
+ m_MaskAlphaCutoff: 0.2
+ m_FrontSortingLayerID: 0
+ m_BackSortingLayerID: 0
+ m_FrontSortingLayer: 0
+ m_BackSortingLayer: 0
+ m_FrontSortingOrder: 0
+ m_BackSortingOrder: 0
+ m_IsCustomRangeActive: 0
m_SpriteSortPoint: 0
---- !u!60 &6527559192278936900
-PolygonCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2824281136311423526}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.25, y: 0.25}
- oldSize: {x: 2.3348837, y: 2.3348837}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: -0.585, y: -0.585}
- - {x: 1.7549999, y: -0.585}
- - {x: 1.7549999, y: 1.7549999}
- - {x: -0.585, y: 1.7549999}
- m_UseDelaunayMesh: 0
---- !u!114 &3464626690849612721
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2824281136311423526}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &2157738590523074599
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2824281136311423526}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
---- !u!1 &3136809114767034397
+--- !u!1 &4506235516538049147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -994,225 +534,30 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 438179655612810879}
- - component: {fileID: 3027046969169083155}
- - component: {fileID: 1178002831675133471}
- - component: {fileID: 4433247060072078454}
- - component: {fileID: 2413687181628102642}
- - component: {fileID: 2208198137967501455}
+ - component: {fileID: 2311446353309964274}
m_Layer: 0
- m_Name: "\u8F85\u52A9\u6DA1\u8F6E"
+ m_Name: "\u6253\u5F00\u4F4D\u7F6E"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &438179655612810879
+--- !u!4 &2311446353309964274
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3136809114767034397}
+ m_GameObject: {fileID: 4506235516538049147}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.8850003, y: -3.4250002, z: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -6.82, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1499443718145266889}
+ m_Father: {fileID: 1010688890868033682}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3027046969169083155
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3136809114767034397}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u8F85\u52A9\u6DA1\u8F6E"
- width: 2
- height: 2
- cellSize: 1.17
- originalPatternStr: 1,0;1,1
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u8F85\u52A9\u6DA1\u8F6E]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &1178002831675133471
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3136809114767034397}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -6680137391059752111, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 2, y: 3}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!60 &4433247060072078454
-PolygonCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3136809114767034397}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.25, y: 0.25}
- oldSize: {x: 2.3255813, y: 2.2976744}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: -0.585, y: -0.585}
- - {x: 1.7549999, y: -0.585}
- - {x: 1.7549999, y: 1.7549999}
- - {x: 0.585, y: 1.7549999}
- - {x: 0.585, y: 0.585}
- - {x: -0.585, y: 0.585}
- m_UseDelaunayMesh: 0
---- !u!114 &2413687181628102642
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3136809114767034397}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &2208198137967501455
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3136809114767034397}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
---- !u!1 &3167217023155311119
+--- !u!1 &4665488012445092027
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1220,231 +565,30 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2039564007509823948}
- - component: {fileID: 3354388668646453004}
- - component: {fileID: 4224202934912696670}
- - component: {fileID: 368555597278964988}
- - component: {fileID: 3315808039184634360}
- - component: {fileID: 1293754395559490698}
+ - component: {fileID: 5674932156508469889}
m_Layer: 0
- m_Name: "\u52A8\u5E73\u8861\u98DE\u8F6E\u7EC4"
+ m_Name: "\u5438\u9644\u70B9"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &2039564007509823948
+--- !u!4 &5674932156508469889
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3167217023155311119}
+ m_GameObject: {fileID: 4665488012445092027}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.0550003, y: -2.2550004, z: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 1.29, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1499443718145266889}
+ m_Father: {fileID: 5779712598771319248}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3354388668646453004
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3167217023155311119}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u52A8\u5E73\u8861\u98DE\u8F6E\u7EC4"
- width: 3
- height: 3
- cellSize: 1.17
- originalPatternStr: 0,1,0;1,1,1;0,1,0
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u52A8\u5E73\u8861\u98DE\u8F6E\u7EC4]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &4224202934912696670
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3167217023155311119}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: 3687556551959615211, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 2, y: 3}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!60 &368555597278964988
-PolygonCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3167217023155311119}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.167, y: 0.167}
- oldSize: {x: 3.4511628, y: 3.4139535}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: 0.585, y: -0.585}
- - {x: 1.7549999, y: -0.585}
- - {x: 1.7549999, y: 0.585}
- - {x: 2.925, y: 0.585}
- - {x: 2.925, y: 1.7549999}
- - {x: 1.7549999, y: 1.7549999}
- - {x: 1.7549999, y: 2.925}
- - {x: 0.585, y: 2.925}
- - {x: 0.585, y: 1.7549999}
- - {x: -0.585, y: 1.7549999}
- - {x: -0.585, y: 0.585}
- - {x: 0.585, y: 0.585}
- m_UseDelaunayMesh: 0
---- !u!114 &3315808039184634360
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3167217023155311119}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &1293754395559490698
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3167217023155311119}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
---- !u!1 &4005591901077341241
+--- !u!1 &4770854772182749078
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1452,37 +596,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1287960863348783248}
- - component: {fileID: 5967947099444148843}
+ - component: {fileID: 6006157550530242493}
+ - component: {fileID: 713579683926968548}
m_Layer: 0
- m_Name: "\u754C\u9762"
+ m_Name: "AO\u95ED\u585E\u9634\u5F71"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1287960863348783248
+--- !u!4 &6006157550530242493
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4005591901077341241}
+ m_GameObject: {fileID: 4770854772182749078}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36279, y: 0, z: 0}
+ m_LocalPosition: {x: -3.24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 7628860540720484160}
+ m_Father: {fileID: 5314670846670034778}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &5967947099444148843
+--- !u!212 &713579683926968548
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4005591901077341241}
+ m_GameObject: {fileID: 4770854772182749078}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -1514,21 +658,21 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 1034535805
+ m_SortingLayer: 9
m_SortingOrder: 3
- m_Sprite: {fileID: 8070436144193895391, guid: 72410d87269b9d54ebd2e54718039746, type: 3}
+ m_Sprite: {fileID: -5393020651753835310, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 5.134884, y: 10.046512}
+ m_Size: {x: 11.27907, y: 10}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
+ m_MaskInteraction: 2
m_SpriteSortPoint: 0
---- !u!1 &5213224785570908867
+--- !u!1 &4791328254598961559
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1536,66 +680,137 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5029250324497363592}
- - component: {fileID: 2753359185163371200}
- - component: {fileID: 6055556293607996134}
- - component: {fileID: 933070375075484428}
- - component: {fileID: 1802169974075634759}
- - component: {fileID: 1313605841524778037}
+ - component: {fileID: 5099443447835133409}
+ - component: {fileID: 1087829019175070639}
m_Layer: 0
- m_Name: "\u6563\u70ED\u7CFB\u7EDF"
+ m_Name: "\u5F00\u542F\u89E6\u53D1\u533A\u57DF"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &5029250324497363592
+--- !u!4 &5099443447835133409
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5213224785570908867}
+ m_GameObject: {fileID: 4791328254598961559}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.565, y: -1.0850003, z: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -6.07, y: 0.25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1499443718145266889}
+ m_Father: {fileID: 1010688890868033682}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2753359185163371200
+--- !u!114 &1087829019175070639
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5213224785570908867}
+ m_GameObject: {fileID: 4791328254598961559}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
+ m_Script: {fileID: 11500000, guid: a9831cebfabb09f4993b755f03fcc5eb, type: 3}
m_Name:
m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u6563\u70ED\u7CFB\u7EDF"
- width: 4
- height: 2
- cellSize: 1.17
- originalPatternStr: 0,1;1,1;1,1;0,1
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u6563\u70ED\u7CFB\u7EDF]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &6055556293607996134
+ width: 2
+ height: 5
+ anchorPoint: 4
+--- !u!1 &5357236874992058540
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5779712598771319248}
+ - component: {fileID: 1017267867930230067}
+ m_Layer: 0
+ m_Name: "\u62BD\u5C49"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5779712598771319248
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5357236874992058540}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -3.66, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2090957857687988833}
+ - {fileID: 6776885350184991729}
+ - {fileID: 4285336378884357864}
+ - {fileID: 5674932156508469889}
+ m_Father: {fileID: 1010688890868033682}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1017267867930230067
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5357236874992058540}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 033a66b82d5f349458216810d638e1f1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ openPosition: {fileID: 2311446353309964274}
+ closePosition: {fileID: 982752880096938688}
+ halfPosition: {fileID: 6779997479549439809}
+ moveDuration: 0.5
+ moveEase: 6
+--- !u!1 &5449787002197896592
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6776885350184991729}
+ - component: {fileID: 5365590960500767551}
+ m_Layer: 0
+ m_Name: "\u62BD\u5C49_1"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6776885350184991729
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5449787002197896592}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.30232525, y: 0.2999997, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 5779712598771319248}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &5365590960500767551
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5213224785570908867}
+ m_GameObject: {fileID: 5449787002197896592}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -1609,7 +824,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+ - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1627,135 +842,20 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -5513373627396260190, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 19
+ m_Sprite: {fileID: 4040690821796898281, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 2, y: 3}
+ m_Size: {x: 3.1162791, y: 5.2093024}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!60 &933070375075484428
-PolygonCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5213224785570908867}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.1, y: 0.25000024}
- oldSize: {x: 4.3813953, y: 2.372093}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: 0.585, y: -0.585}
- - {x: 2.925, y: -0.585}
- - {x: 2.925, y: 0.585}
- - {x: 4.095, y: 0.585}
- - {x: 4.095, y: 1.7549999}
- - {x: -0.585, y: 1.7549999}
- - {x: -0.585, y: 0.585}
- - {x: 0.585, y: 0.585}
- m_UseDelaunayMesh: 0
---- !u!114 &1802169974075634759
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5213224785570908867}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &1313605841524778037
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5213224785570908867}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
--- !u!1 &5832289988495609530
GameObject:
m_ObjectHideFlags: 0
@@ -1788,8 +888,9 @@ Transform:
m_Children:
- {fileID: 6819706543272752684}
- {fileID: 1302769718923676967}
+ - {fileID: 1010688890868033682}
+ - {fileID: 5314670846670034778}
- {fileID: 1499443718145266889}
- - {fileID: 7628860540720484160}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &205405881972710832
@@ -1806,45 +907,48 @@ MonoBehaviour:
m_EditorClassIdentifier:
grid: {fileID: 2843654655404132764}
shapeRoot: {fileID: 1499443718145266889}
- shapeRack: {fileID: 0}
+ blockPuzzlePanel: {fileID: 0}
+ shapeRecycleSlot: {fileID: 5821461881795384241}
puzzleData:
- puzzleName: "\u793A\u4F8B"
+ puzzleName: Game2
gridWidth: 6
gridHeight: 7
cellSize: 1.17
gridShapeDataInfos:
- - shapeKey: "\u60EF\u6027\u7A33\u538B\u5668"
- rootCell: {x: 0, y: 0}
- rotationAngle: 0
- isDraggable: 1
- - shapeKey: "\u6563\u70ED\u7CFB\u7EDF"
- rootCell: {x: 0, y: 2}
- rotationAngle: 0
- isDraggable: 1
- - shapeKey: "\u65E7\u5F0F\u91CD\u578B\u5F15\u64CE"
- rootCell: {x: 0, y: 4}
+ - shapeKey: "\u5171\u9E23\u8154"
+ rootCell: {x: 4, y: 5}
rotationAngle: 0
isDraggable: 1
- shapeKey: "\u52A8\u5E73\u8861\u98DE\u8F6E\u7EC4"
- rootCell: {x: 3, y: 1}
+ rootCell: {x: 3, y: 2}
rotationAngle: 0
isDraggable: 1
- - shapeKey: "\u8F85\u52A9\u6DA1\u8F6E"
- rootCell: {x: 4, y: 0}
+ - shapeKey: "\u60EF\u6027\u7A33\u538B\u5668"
+ rootCell: {x: 0, y: 0}
rotationAngle: 0
isDraggable: 1
- shapeKey: "\u8FDB\u6C14\u7CFB\u7EDF"
rootCell: {x: 2, y: 0}
rotationAngle: 0
isDraggable: 1
- - shapeKey: "\u6392\u6C14\u5171\u9E23\u8154"
- rootCell: {x: 4, y: 4}
+ - shapeKey: "\u8F85\u52A9\u6DA1\u8F6E"
+ rootCell: {x: 4, y: 0}
rotationAngle: 0
isDraggable: 1
- shapeRackDataInfos: []
+ - shapeKey: "\u6563\u70ED\u7CFB\u7EDF"
+ rootCell: {x: 0, y: 2}
+ rotationAngle: 0
+ isDraggable: 1
+ - shapeKey: "\u65E7\u52A8\u529B\u6838\u5FC3"
+ rootCell: {x: 0, y: 4}
+ rotationAngle: 0
+ isDraggable: 1
+ shapeInRack:
+ - "\u65B0\u52A8\u529B\u6838\u5FC3"
+ - "\u6563\u70ED\u6761"
validatorName: "BlockPuzzleValidtor/\u5F15\u64CE\u5BA4\u89C4\u5219.asset"
initializeOnStart: 1
---- !u!1 &6668614951528669954
+--- !u!1 &6209203838339227769
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1852,37 +956,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 585565298457428618}
- - component: {fileID: 6213904822448501237}
+ - component: {fileID: 4285336378884357864}
+ - component: {fileID: 6123633997090440739}
m_Layer: 0
- m_Name: "\u80CC\u666F"
+ m_Name: "\u62BD\u5C49\u5E95\u4E0B\u9634\u5F71"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &585565298457428618
+--- !u!4 &4285336378884357864
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6668614951528669954}
+ m_GameObject: {fileID: 6209203838339227769}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0.27906895, y: 0.393023, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 7628860540720484160}
+ m_Father: {fileID: 5779712598771319248}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6213904822448501237
+--- !u!212 &6123633997090440739
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6668614951528669954}
+ m_GameObject: {fileID: 6209203838339227769}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -1914,21 +1018,21 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 1
- m_Sprite: {fileID: -377284112413580491, guid: 72410d87269b9d54ebd2e54718039746, type: 3}
+ m_SortingLayerID: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 18
+ m_Sprite: {fileID: 4903693627952072399, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 17.860466, y: 10.046512}
+ m_Size: {x: 3.3488371, y: 5.3023257}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &8155762674042709482
+--- !u!1 &6343358380424524603
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1936,100 +1040,150 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 7628860540720484160}
+ - component: {fileID: 7968244780405505479}
+ - component: {fileID: 1939276753096450851}
m_Layer: 0
- m_Name: "\u80CC\u666F"
+ m_Name: "\u5173\u95ED\u89E6\u53D1\u533A\u57DF"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &7628860540720484160
+--- !u!4 &7968244780405505479
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8155762674042709482}
+ m_GameObject: {fileID: 6343358380424524603}
serializedVersion: 2
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: 1287960863348783248}
- - {fileID: 1862300142758591214}
- - {fileID: 585565298457428618}
- m_Father: {fileID: 1133554645891563439}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8674205148396041441
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7203917669022731298}
- - component: {fileID: 5359645410722994443}
- - component: {fileID: 1496598683230552500}
- - component: {fileID: 8444222500119446064}
- - component: {fileID: 7559386195103638265}
- - component: {fileID: 7331266035742709656}
- m_Layer: 0
- m_Name: "\u6392\u6C14\u5171\u9E23\u8154"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &7203917669022731298
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8674205148396041441}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.8850003, y: 1.2549996, z: 0}
+ m_LocalPosition: {x: -6.8, y: 0.25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1499443718145266889}
+ m_Father: {fileID: 1010688890868033682}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5359645410722994443
+--- !u!114 &1939276753096450851
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8674205148396041441}
+ m_GameObject: {fileID: 6343358380424524603}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4be33b2e5baf96447a7df0d10cb22064, type: 3}
+ m_Script: {fileID: 11500000, guid: a9831cebfabb09f4993b755f03fcc5eb, type: 3}
m_Name:
m_EditorClassIdentifier:
- _blockShapeData:
- shapeId: 2
- shapeName: "\u6392\u6C14\u5171\u9E23\u8154"
- width: 2
- height: 3
- cellSize: 1.17
- originalPatternStr: 1,1,1;1,0,1
- spritePath: "BlockPuzzle/\u5F15\u64CE\u4ED3\u90E8\u4EF6[\u6392\u6C14\u5171\u9E23\u8154]"
- shapeProperties: []
- shapeDescription:
- extraLimits: 0
- rootLimit: {x: 0, y: 0}
- rotationAngleLimit: 0
---- !u!212 &1496598683230552500
+ width: 3.5
+ height: 5
+ anchorPoint: 4
+--- !u!1 &7489342787601982844
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6779997479549439809}
+ m_Layer: 0
+ m_Name: "\u534A\u5F00\u4F4D\u7F6E"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6779997479549439809
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7489342787601982844}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -4.27, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1010688890868033682}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7819001335259345947
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5314670846670034778}
+ m_Layer: 0
+ m_Name: "\u5F15\u64CE\u5E95\u56FE"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5314670846670034778
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7819001335259345947}
+ serializedVersion: 2
+ 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: 3076516476807821284}
+ - {fileID: 6006157550530242493}
+ - {fileID: 6640144315775818586}
+ - {fileID: 6649725243761466404}
+ m_Father: {fileID: 1133554645891563439}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8141754737200623651
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3076516476807821284}
+ - component: {fileID: 1996579104060247584}
+ m_Layer: 0
+ m_Name: "\u8FB9\u6846"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &3076516476807821284
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8141754737200623651}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -2.4767447, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 5314670846670034778}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1996579104060247584
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8674205148396041441}
+ m_GameObject: {fileID: 8141754737200623651}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -2043,7 +1197,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+ - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -2061,132 +1215,48 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -4903168459446787704, guid: 4a2b713e6648d764094de9d628609c75, type: 3}
+ m_SortingLayerID: 1034535805
+ m_SortingLayer: 9
+ m_SortingOrder: 2
+ m_Sprite: {fileID: -6108097492665087018, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 2, y: 3}
+ m_Size: {x: 12.906977, y: 10.046512}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!60 &8444222500119446064
-PolygonCollider2D:
+--- !u!1 &8360476067381985894
+GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8674205148396041441}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.25, y: 0.167}
- oldSize: {x: 2.3906977, y: 3.4976745}
- newSize: {x: 2, y: 3}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: -0.585, y: -0.585}
- - {x: 1.7549999, y: -0.585}
- - {x: 1.7549999, y: 0.585}
- - {x: 0.585, y: 0.585}
- - {x: 0.585, y: 1.7549999}
- - {x: 1.7549999, y: 1.7549999}
- - {x: 1.7549999, y: 2.925}
- - {x: -0.585, y: 2.925}
- m_UseDelaunayMesh: 0
---- !u!114 &7559386195103638265
-MonoBehaviour:
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 982752880096938688}
+ m_Layer: 0
+ m_Name: "\u5173\u95ED\u4F4D\u7F6E"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &982752880096938688
+Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8674205148396041441}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 2
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 3
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 4
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 5
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 14
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 13
- callback:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &7331266035742709656
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8674205148396041441}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62aeab6b39ab40949ab3e66462c5e295, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDraggable: 1
- snapColor: {r: 0, g: 1, b: 0, a: 0.7}
- invalidColor: {r: 1, g: 0, b: 0, a: 0.7}
- normalColor: {r: 1, g: 1, b: 1, a: 1}
- dragScale: 1.1
+ m_GameObject: {fileID: 8360476067381985894}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -3.72, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1010688890868033682}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd b/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd
index c35f62791..1803790f8 100644
--- a/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd
+++ b/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:60ad7adca39eb079c946d905309911ece38d64202299295ab5273b8f12553d02
-size 185542
+oid sha256:df5844c4802ecf5dc5dbe3da6d51557c9492a1374d298d7d6409acbc43d950f8
+size 185341
diff --git a/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd.meta b/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd.meta
index 2ab072c42..a110fbdcc 100644
--- a/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd.meta
+++ b/Assets/RawResources/Art/网格拼图相关素材/石头动力模块维修界面.psd.meta
@@ -183,7 +183,7 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 199, y: 429}
spritePosition: {x: 379, y: 81}
- - name: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B"
+ - name: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B\u60AC\u505C"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -194,7 +194,7 @@ ScriptedImporter:
y: 419
width: 23
height: 18
- spriteID: 66ce627837168c747b628b4086a2afda
+ spriteID: 0db20e613f3782a41a2c7c5ac574ef61
spriteBone: []
spriteOutline: []
vertices: []
@@ -204,7 +204,7 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 168, y: 419}
spritePosition: {x: 238, y: 80}
- - name: "\u63D0\u4EA4\u6309\u94AE\u672A\u6FC0\u6D3B\u60AC\u505C"
+ - name: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -215,7 +215,7 @@ ScriptedImporter:
y: 445
width: 23
height: 18
- spriteID: 39de5653cf6d8e445bef16c06ae5ff96
+ spriteID: 66ce627837168c747b628b4086a2afda
spriteBone: []
spriteOutline: []
vertices: []
@@ -225,7 +225,7 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 168, y: 445}
spritePosition: {x: 238, y: 80}
- - name: "\u63D0\u4EA4\u6309\u94AE\u672A\u6FC0\u6D3B"
+ - name: "\u63D0\u4EA4\u6309\u94AE\u672A\u6FC0\u6D3B\u60AC\u505C"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -236,7 +236,7 @@ ScriptedImporter:
y: 471
width: 23
height: 18
- spriteID: 448ae6aa4a49ee948a6624d9101affdc
+ spriteID: 39de5653cf6d8e445bef16c06ae5ff96
spriteBone: []
spriteOutline: []
vertices: []
@@ -246,6 +246,27 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 168, y: 471}
spritePosition: {x: 238, y: 80}
+ - name: "\u63D0\u4EA4\u6309\u94AE\u672A\u6FC0\u6D3B"
+ originalName:
+ pivot: {x: 0.5, y: 0.5}
+ alignment: 0
+ border: {x: 0, y: 0, z: 0, w: 0}
+ rect:
+ serializedVersion: 2
+ x: 209
+ y: 366
+ width: 23
+ height: 18
+ spriteID: 448ae6aa4a49ee948a6624d9101affdc
+ spriteBone: []
+ spriteOutline: []
+ vertices: []
+ spritePhysicsOutline: []
+ indices:
+ edges: []
+ tessellationDetail: 0
+ uvTransform: {x: 209, y: 366}
+ spritePosition: {x: 238, y: 80}
- name: "\u76EE\u6807\u5C4F\u5E55"
originalName:
pivot: {x: 0.5, y: 0.5}
@@ -317,7 +338,7 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 209
- y: 394
+ y: 420
width: 15
height: 15
spriteID: df8609dcdcec37d41919b4b955817cb9
@@ -328,7 +349,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 209, y: 394}
+ uvTransform: {x: 209, y: 420}
spritePosition: {x: 249, y: 43}
- name: "\u9009\u62E9\u5C4F\u5E55"
originalName:
@@ -401,7 +422,7 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 209
- y: 366
+ y: 392
width: 19
height: 20
spriteID: f0ee7b155b20bed48b29cf33463953c6
@@ -412,7 +433,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 209, y: 366}
+ uvTransform: {x: 209, y: 392}
spritePosition: {x: 283, y: 37}
- name: "\u5E95\u56FE"
originalName:
@@ -781,22 +802,22 @@ ScriptedImporter:
isImported: 1
isVisible: 1
- name: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B\u60AC\u505C"
- spriteName:
+ spriteName: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B\u60AC\u505C"
isGroup: 0
parentIndex: 1
spriteID: 0db20e613f3782a41a2c7c5ac574ef61
layerID: 30
- mosaicPosition: {x: 0, y: 0}
+ mosaicPosition: {x: 168, y: 419}
flatten: 0
- isImported: 0
- isVisible: 0
+ isImported: 1
+ isVisible: 1
- name: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B"
spriteName: "\u63D0\u4EA4\u6309\u94AE\u6FC0\u6D3B"
isGroup: 0
parentIndex: 1
spriteID: 66ce627837168c747b628b4086a2afda
layerID: 29
- mosaicPosition: {x: 168, y: 419}
+ mosaicPosition: {x: 168, y: 445}
flatten: 0
isImported: 1
isVisible: 1
@@ -806,7 +827,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: 39de5653cf6d8e445bef16c06ae5ff96
layerID: 28
- mosaicPosition: {x: 168, y: 445}
+ mosaicPosition: {x: 168, y: 471}
flatten: 0
isImported: 1
isVisible: 1
@@ -816,7 +837,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: 448ae6aa4a49ee948a6624d9101affdc
layerID: 27
- mosaicPosition: {x: 168, y: 471}
+ mosaicPosition: {x: 209, y: 366}
flatten: 0
isImported: 1
isVisible: 1
@@ -876,7 +897,7 @@ ScriptedImporter:
parentIndex: 13
spriteID: df8609dcdcec37d41919b4b955817cb9
layerID: 20
- mosaicPosition: {x: 209, y: 394}
+ mosaicPosition: {x: 209, y: 420}
flatten: 0
isImported: 1
isVisible: 1
@@ -916,7 +937,7 @@ ScriptedImporter:
parentIndex: 13
spriteID: f0ee7b155b20bed48b29cf33463953c6
layerID: 42
- mosaicPosition: {x: 209, y: 366}
+ mosaicPosition: {x: 209, y: 392}
flatten: 0
isImported: 1
isVisible: 1
diff --git a/Assets/Scenes/网格测试.unity b/Assets/Scenes/网格测试.unity
index fc1d785b0..1625e9c0e 100644
--- a/Assets/Scenes/网格测试.unity
+++ b/Assets/Scenes/网格测试.unity
@@ -181,7 +181,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 0
+ m_PresetInfoIsWorld: 1
--- !u!223 &96399204
Canvas:
m_ObjectHideFlags: 0
@@ -191,7 +191,7 @@ Canvas:
m_GameObject: {fileID: 96399201}
m_Enabled: 1
serializedVersion: 3
- m_RenderMode: 1
+ m_RenderMode: 2
m_Camera: {fileID: 791020755}
m_PlaneDistance: 100
m_PixelPerfect: 0
@@ -199,7 +199,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
- m_VertexColorAlwaysGammaSpace: 0
+ m_VertexColorAlwaysGammaSpace: 1
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 1016946085
@@ -213,8 +213,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 96399201}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 90}
+ m_LocalScale: {x: 0.00925926, y: 0.00925926, z: 0.00925926}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2126631942}
@@ -223,8 +223,8 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 0}
+ m_SizeDelta: {x: 1920.0001, y: 1080}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &104415614
GameObject:
m_ObjectHideFlags: 0
@@ -356,10 +356,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 191344402}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 19.6, y: -16.666668}
+ m_SizeDelta: {x: 39.2, y: 33.333336}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &269040779
MonoBehaviour:
@@ -469,7 +469,8 @@ GameObject:
- component: {fileID: 293111316}
- component: {fileID: 293111319}
- component: {fileID: 293111318}
- - component: {fileID: 293111317}
+ - component: {fileID: 293111320}
+ - component: {fileID: 293111321}
m_Layer: 0
m_Name: "\u63D0\u4EA4"
m_TagString: Untagged
@@ -496,50 +497,6 @@ RectTransform:
m_AnchoredPosition: {x: -129.49998, y: -83.4}
m_SizeDelta: {x: 115.45, y: 90.4}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &293111317
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 293111315}
- 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: 0
- 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: 293111318}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
--- !u!114 &293111318
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -578,6 +535,77 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293111315}
m_CullTransparentMesh: 1
+--- !u!114 &293111320
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 293111315}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f5702aa38bfd4746aecc799b153aab91, 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: 0
+ 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: 293111318}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ onStateTransition:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &293111321
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 293111315}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: df5a7683c04d2a04b84b5fc5f02d2306, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ validAsset:
+ normalSprite: {fileID: -4923379366992266037, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ highlightedSprite: {fileID: -5925149399911416888, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ pressedSprite: {fileID: -5925149399911416888, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ selectedSprite: {fileID: -4923379366992266037, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ disabledSprite: {fileID: -4923379366992266037, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ invalidAsset:
+ normalSprite: {fileID: -5883485148163578533, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ highlightedSprite: {fileID: -5609693637154023505, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ pressedSprite: {fileID: -5609693637154023505, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ selectedSprite: {fileID: -5883485148163578533, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ disabledSprite: {fileID: -5883485148163578533, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
--- !u!1 &335102489
GameObject:
m_ObjectHideFlags: 0
@@ -1077,7 +1105,7 @@ Transform:
m_GameObject: {fileID: 498353938}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1192,7 +1220,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
- m_Transition: 1
+ m_Transition: 2
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}
@@ -1202,10 +1230,10 @@ MonoBehaviour:
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_HighlightedSprite: {fileID: 1475165334167220824, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ m_PressedSprite: {fileID: 2860266655482515901, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ m_SelectedSprite: {fileID: -2364938764405369563, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
+ m_DisabledSprite: {fileID: -2364938764405369563, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
@@ -1291,7 +1319,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -188.4, y: 160.3}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: 104.54, y: 28.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &548351770
MonoBehaviour:
@@ -1442,7 +1470,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: -5}
- m_SizeDelta: {x: 0, y: 50.89}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &558624984
MonoBehaviour:
@@ -1681,9 +1709,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fd2704b8fbdb65d49bc3201c0e7b714a, type: 3}
m_Name:
m_EditorClassIdentifier:
+ powerProgressBar: {fileID: 1098450995}
+ noiseProgressBar: {fileID: 1306703714}
+ heatProgressBar: {fileID: 1000406101}
_deviceButtonRoot: {fileID: 1211326591}
_deviceItemPrefab: {fileID: 4143230107302099057, guid: 9345b48dfa0bded4db0af9dd6eb482c4, type: 3}
- lockButton: {fileID: 293111317}
+ lockButton: {fileID: 293111320}
popUpButton: {fileID: 535456365}
--- !u!1 &605981712
GameObject:
@@ -1721,7 +1752,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -189, y: 161}
- m_SizeDelta: {x: 104.54, y: 28.01}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &605981714
MonoBehaviour:
@@ -2297,10 +2328,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 191344402}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 32.67, y: -83.33334}
+ m_SizeDelta: {x: 65.34, y: 33.333336}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &881893049
MonoBehaviour:
@@ -2399,59 +2430,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881893047}
m_CullTransparentMesh: 1
---- !u!1 &995348382
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 995348383}
- - component: {fileID: 995348384}
- m_Layer: 0
- m_Name: "\u56DE\u6536\u69FD\u4F4D"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &995348383
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 995348382}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.78, y: -2.65, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 3949647421954991158}
- - {fileID: 1006207894}
- - {fileID: 1501284897}
- - {fileID: 1084840941}
- - {fileID: 1456095183}
- - {fileID: 1136123082}
- m_Father: {fileID: 4973841588922437152}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &995348384
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 995348382}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: c2a72a6db090d2e40a34ae7627d36a7e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- mover: {fileID: 3949647421954991159}
- halfArea: {fileID: 1456095184}
- openArea: {fileID: 1136123083}
--- !u!1 &1000406099
GameObject:
m_ObjectHideFlags: 0
@@ -2499,7 +2477,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
spriteRendererCount: 18
maxValue: 100
- currentValue: 20
+ currentValue: 0
sprite: {fileID: -778163497, guid: b5cb4acd7ed89da4097893fe93a2be0c, type: 3}
spacing: 0.195
startPosition: {x: 0, y: 0, z: 0}
@@ -2523,37 +2501,6 @@ MonoBehaviour:
moreColor: {r: 1, g: 0, b: 0, a: 1}
progressBar: {fileID: 1000406101}
signLight: {fileID: 1326352716}
---- !u!1 &1006207893
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1006207894}
- m_Layer: 0
- m_Name: "\u5173\u95ED\u4F4D\u7F6E"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1006207894
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1006207893}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.72, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 995348383}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1016965049
GameObject:
m_ObjectHideFlags: 0
@@ -2670,9 +2617,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2066203128}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 50, y: -29.225002}
m_SizeDelta: {x: 72.54, y: 58.450005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1029671646
@@ -2806,9 +2753,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2066203128}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 50, y: -117.675}
m_SizeDelta: {x: 72.54, y: 58.450005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1069393908
@@ -2994,37 +2941,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &1084840940
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1084840941}
- m_Layer: 0
- m_Name: "\u6253\u5F00\u4F4D\u7F6E"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1084840941
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1084840940}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -6.82, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 995348383}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1098450993
GameObject:
m_ObjectHideFlags: 0
@@ -3072,7 +2988,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
spriteRendererCount: 18
maxValue: 100
- currentValue: 60
+ currentValue: 0
sprite: {fileID: -778163497, guid: b5cb4acd7ed89da4097893fe93a2be0c, type: 3}
spacing: 0.195
startPosition: {x: 0, y: 0, z: 0}
@@ -3171,53 +3087,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1105741518}
m_CullTransparentMesh: 1
---- !u!1 &1136123081
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1136123082}
- - component: {fileID: 1136123083}
- m_Layer: 0
- m_Name: "\u5173\u95ED\u89E6\u53D1\u533A\u57DF"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1136123082
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1136123081}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -6.8, y: 0.25, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 995348383}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1136123083
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1136123081}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a9831cebfabb09f4993b755f03fcc5eb, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- width: 3.5
- height: 5
- anchorPoint: 4
--- !u!1 &1189602581
GameObject:
m_ObjectHideFlags: 0
@@ -3485,7 +3354,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
spriteRendererCount: 18
maxValue: 100
- currentValue: 20
+ currentValue: 0
sprite: {fileID: -778163497, guid: b5cb4acd7ed89da4097893fe93a2be0c, type: 3}
spacing: 0.195
startPosition: {x: 0, y: 0, z: 0}
@@ -3625,10 +3494,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 191344402}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 19.6, y: -50.000004}
+ m_SizeDelta: {x: 39.2, y: 33.333336}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1349546179
MonoBehaviour:
@@ -3759,9 +3628,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2066203128}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 50, y: -206.12502}
m_SizeDelta: {x: 72.54, y: 58.450005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1397299356
@@ -3995,53 +3864,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447680739}
m_CullTransparentMesh: 1
---- !u!1 &1456095182
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1456095183}
- - component: {fileID: 1456095184}
- m_Layer: 0
- m_Name: "\u5F00\u542F\u89E6\u53D1\u533A\u57DF"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1456095183
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1456095182}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -6.07, y: 0.25, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 995348383}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1456095184
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1456095182}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a9831cebfabb09f4993b755f03fcc5eb, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- width: 2
- height: 5
- anchorPoint: 4
--- !u!1 &1467061558
GameObject:
m_ObjectHideFlags: 0
@@ -4181,37 +4003,6 @@ PlayableDirector:
value: {fileID: 599612778}
m_ExposedReferences:
m_References: []
---- !u!1 &1501284896
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1501284897}
- m_Layer: 0
- m_Name: "\u534A\u5F00\u4F4D\u7F6E"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1501284897
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1501284896}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.27, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 995348383}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1532984430
GameObject:
m_ObjectHideFlags: 0
@@ -4228,7 +4019,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1532984431
RectTransform:
m_ObjectHideFlags: 0
@@ -4262,7 +4053,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2ae01a11315f32641916e2273a689bc3, type: 3}
m_Name:
m_EditorClassIdentifier:
- IsLineView: 1
logText: {fileID: 2011813025}
textFields: []
imageFields: []
@@ -4282,7 +4072,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1650896847
RectTransform:
m_ObjectHideFlags: 0
@@ -4320,7 +4110,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2ae01a11315f32641916e2273a689bc3, type: 3}
m_Name:
m_EditorClassIdentifier:
- IsLineView: 0
logText: {fileID: 0}
textFields:
- {fileID: 1447680741}
@@ -4410,89 +4199,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &1752456728
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1752456729}
- - component: {fileID: 1752456730}
- m_Layer: 0
- m_Name: "\u8FB9\u6846\u906E\u7F69"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1752456729
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1752456728}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -2.476745, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1670789329758523726}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!331 &1752456730
-SpriteMask:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1752456728}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Sprite: {fileID: -6108097492665087018, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
- m_MaskAlphaCutoff: 0.2
- m_FrontSortingLayerID: 0
- m_BackSortingLayerID: 0
- m_FrontSortingLayer: 0
- m_BackSortingLayer: 0
- m_FrontSortingOrder: 0
- m_BackSortingOrder: 0
- m_IsCustomRangeActive: 0
- m_SpriteSortPoint: 0
--- !u!1 &2011813022
GameObject:
m_ObjectHideFlags: 0
@@ -4924,37 +4630,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &489571309220462558
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3515182460094241669}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.24, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1670789329758523726}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &569652438232877357
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1670789329758523726}
- m_Layer: 0
- m_Name: "\u5F15\u64CE\u5E95\u56FE"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &722829565968555536
GameObject:
m_ObjectHideFlags: 0
@@ -4972,21 +4647,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &901420097078737556
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1548002986837375463}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.27906895, y: 0.393023, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3949647421954991158}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1218164369499808667
GameObject:
m_ObjectHideFlags: 0
@@ -5004,23 +4664,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &1548002986837375463
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 901420097078737556}
- - component: {fileID: 6451381131747778080}
- m_Layer: 0
- m_Name: "\u62BD\u5C49\u5E95\u4E0B\u9634\u5F71"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!4 &1614644309584232046
Transform:
m_ObjectHideFlags: 0
@@ -5038,77 +4681,6 @@ Transform:
- {fileID: 8224851432342010873}
m_Father: {fileID: 5112960018860681732}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1668763522017384211
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5350759119791012116}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 1034535805
- m_SortingLayer: 9
- m_SortingOrder: 2
- m_Sprite: {fileID: -6108097492665087018, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 12.906977, y: 10.046512}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!4 &1670789329758523726
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 569652438232877357}
- serializedVersion: 2
- 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: 4160053161028248809}
- - {fileID: 489571309220462558}
- - {fileID: 7933292123696950696}
- - {fileID: 1752456729}
- m_Father: {fileID: 4973841588922437152}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1769147441592222774
Transform:
m_ObjectHideFlags: 0
@@ -5279,57 +4851,6 @@ Transform:
m_Children: []
m_Father: {fileID: 375453185567817599}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3195303741195312728
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7535196657357885863}
- - component: {fileID: 8383865483836904787}
- m_Layer: 0
- m_Name: "\u62BD\u5C49_1"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &3317716719832490124
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3949647421954991158}
- - component: {fileID: 3949647421954991159}
- m_Layer: 0
- m_Name: "\u62BD\u5C49"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &3515182460094241669
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 489571309220462558}
- - component: {fileID: 5279366034349101140}
- m_Layer: 0
- m_Name: "AO\u95ED\u585E\u9634\u5F71"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &3714885012444554289
GameObject:
m_ObjectHideFlags: 0
@@ -5347,73 +4868,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &3759688867793350043
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5351655866736032224}
- - component: {fileID: 7588271448714312193}
- m_Layer: 0
- m_Name: "\u62BD\u5C49AO\u95ED\u585E\u9634\u5F71"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &3949647421954991158
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3317716719832490124}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.72, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 5351655866736032224}
- - {fileID: 7535196657357885863}
- - {fileID: 901420097078737556}
- m_Father: {fileID: 995348383}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3949647421954991159
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3317716719832490124}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 033a66b82d5f349458216810d638e1f1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- openPosition: {fileID: 1084840941}
- closePosition: {fileID: 1006207894}
- halfPosition: {fileID: 1501284897}
- moveDuration: 0.5
- moveEase: 6
---- !u!4 &4160053161028248809
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5350759119791012116}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.4767447, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1670789329758523726}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4230934029244671040
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -5545,93 +4999,33 @@ PrefabInstance:
propertyPath: blockPuzzlePanel
value:
objectReference: {fileID: 2126631945}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: shapeRecycleSlot
- value:
- objectReference: {fileID: 995348384}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.puzzleName
- value: Game2
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.shapeInRack.Array.size
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.shapeInRack.Array.data[0]
- value: "\u65B0\u52A8\u529B\u6838\u5FC3"
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.shapeInRack.Array.data[1]
- value: "\u6563\u70ED\u6761"
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.size
- value: 7
- objectReference: {fileID: 0}
- target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
propertyPath: puzzleData.gridShapeDataInfos.Array.data[0].shapeKey
- value: "\u5171\u9E23\u8154"
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[1].shapeKey
value: "\u52A8\u5E73\u8861\u98DE\u8F6E\u7EC4"
objectReference: {fileID: 0}
- target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[2].shapeKey
- value: "\u60EF\u6027\u7A33\u538B\u5668"
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[3].shapeKey
- value: "\u8FDB\u6C14\u7CFB\u7EDF"
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[5].shapeKey
- value: "\u6563\u70ED\u7CFB\u7EDF"
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[6].shapeKey
- value: "\u65E7\u52A8\u529B\u6838\u5FC3"
+ propertyPath: puzzleData.gridShapeDataInfos.Array.data[1].shapeKey
+ value: "\u5171\u9E23\u8154"
objectReference: {fileID: 0}
- target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
propertyPath: puzzleData.gridShapeDataInfos.Array.data[0].rootCell.x
- value: 4
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[0].rootCell.y
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[1].rootCell.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[2].rootCell.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[3].rootCell.x
+ propertyPath: puzzleData.gridShapeDataInfos.Array.data[0].rootCell.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[3].rootCell.y
- value: 0
+ propertyPath: puzzleData.gridShapeDataInfos.Array.data[1].rootCell.x
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[5].rootCell.x
- value: 0
+ propertyPath: puzzleData.gridShapeDataInfos.Array.data[1].rootCell.y
+ value: 5
objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[5].rootCell.y
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 205405881972710832, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: puzzleData.gridShapeDataInfos.Array.data[6].rootCell.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 856747765937572932, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_IsActive
- value: 1
+ - target: {fileID: 1010688890868033682, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6.79
objectReference: {fileID: 0}
- target: {fileID: 1133554645891563439, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
propertyPath: m_LocalPosition.x
@@ -5673,66 +5067,63 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1372856441920777658, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_SortingOrder
- value: 1
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: sortingLayer
+ value: 1134468525
objectReference: {fileID: 0}
- - target: {fileID: 4005591901077341241, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_IsActive
- value: 0
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: sortingOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: gridLineColor.a
+ value: 0.019607844
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: emptyCellColor.a
+ value: 0.019607844
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: occupiedCellColor.a
+ value: 0.019607844
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: occupiedCellColor.b
+ value: 0.9019608
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: occupiedCellColor.g
+ value: 0.9019608
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: occupiedCellColor.r
+ value: 0.9019608
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: previewValidCellColor.a
+ value: 0.078431375
+ objectReference: {fileID: 0}
+ - target: {fileID: 1146770068189822050, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: previewInvalidCellColor.a
+ value: 0.078431375
+ objectReference: {fileID: 0}
+ - target: {fileID: 1939276753096450851, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: height
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5099443447835133409, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -5.29
objectReference: {fileID: 0}
- target: {fileID: 5832289988495609530, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
propertyPath: m_Name
value: Block Puzzle Game
objectReference: {fileID: 0}
- - target: {fileID: 5832289988495609530, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5967947099444148843, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_Enabled
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6213904822448501237, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_SortingOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6668614951528669954, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7203917669022731298, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_LocalPosition.x
- value: 1.04
- objectReference: {fileID: 0}
- - target: {fileID: 8155762674042709482, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
m_RemovedComponents: []
- m_RemovedGameObjects:
- - {fileID: 8674205148396041441, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 2234235524907542922, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 3136809114767034397, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 3167217023155311119, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 1997755591233928732, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 5213224785570908867, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 2824281136311423526, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- - {fileID: 8155762674042709482, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 1133554645891563439, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- insertIndex: 2
- addedObject: {fileID: 995348383}
- - targetCorrespondingSourceObject: {fileID: 1133554645891563439, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- insertIndex: 3
- addedObject: {fileID: 1670789329758523726}
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
---- !u!4 &4973841588922437152 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1133554645891563439, guid: 5b2e098922156b645a82b7bcdb436ac9, type: 3}
- m_PrefabInstance: {fileID: 4973841588922437151}
- m_PrefabAsset: {fileID: 0}
--- !u!4 &5112960018860681732
Transform:
m_ObjectHideFlags: 0
@@ -5773,58 +5164,6 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
---- !u!212 &5279366034349101140
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3515182460094241669}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 100
- m_Sprite: {fileID: -5393020651753835310, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 11.27907, y: 10}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 2
- m_SpriteSortPoint: 0
--- !u!1 &5321623926151435143
GameObject:
m_ObjectHideFlags: 0
@@ -5842,38 +5181,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &5350759119791012116
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4160053161028248809}
- - component: {fileID: 1668763522017384211}
- m_Layer: 0
- m_Name: "\u8FB9\u6846"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &5351655866736032224
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3759688867793350043}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.93023205, y: 0.3, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3949647421954991158}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5642937755487522085
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -5941,58 +5248,6 @@ Transform:
m_Children: []
m_Father: {fileID: 5112960018860681732}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6451381131747778080
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1548002986837375463}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 1
- m_Sprite: {fileID: 4903693627952072399, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 3.3488371, y: 5.3023257}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &6454654521631228249
GameObject:
m_ObjectHideFlags: 0
@@ -6011,23 +5266,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &6724470108051496339
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7933292123696950696}
- - component: {fileID: 8686579473587430687}
- m_Layer: 0
- m_Name: Background
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!212 &6807208206068899921
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -6180,88 +5418,6 @@ Transform:
m_Children: []
m_Father: {fileID: 375453185567817599}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &7535196657357885863
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3195303741195312728}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.30232525, y: 0.2999997, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3949647421954991158}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7588271448714312193
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3759688867793350043}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 3
- m_Sprite: {fileID: -7616958423233772794, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 3.5348837, y: 5.2093024}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!4 &7933292123696950696
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6724470108051496339}
- serializedVersion: 2
- 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: 1670789329758523726}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8175606826540433908
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -6329,58 +5485,6 @@ Transform:
m_Children: []
m_Father: {fileID: 1614644309584232046}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &8383865483836904787
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3195303741195312728}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 2
- m_Sprite: {fileID: 4040690821796898281, guid: 4582ccb894b27e84aaa320b8f5dad70f, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 3.1162791, y: 5.2093024}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!4 &8416821685753028935
Transform:
m_ObjectHideFlags: 0
@@ -6550,58 +5654,6 @@ SortingGroup:
m_SortingLayer: 11
m_SortingOrder: 0
m_SortAtRoot: 0
---- !u!212 &8686579473587430687
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6724470108051496339}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 1034535805
- m_SortingLayer: 9
- m_SortingOrder: 1
- m_Sprite: {fileID: -5149185653679605778, guid: eb7bc07dc232e7d4dbe28cdc16612c13, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 17.860466, y: 10.046512}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!212 &9153415064469407048
SpriteRenderer:
m_ObjectHideFlags: 0
diff --git a/Assets/ScriptableObjects/BlockPuzzleValidtor/引擎室规则.asset b/Assets/ScriptableObjects/BlockPuzzleValidtor/引擎室规则.asset
index 9fcc74f19..d9a705b84 100644
--- a/Assets/ScriptableObjects/BlockPuzzleValidtor/引擎室规则.asset
+++ b/Assets/ScriptableObjects/BlockPuzzleValidtor/引擎室规则.asset
@@ -14,15 +14,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
baseConditions:
- name: "\u52A8\u529B"
- property: PWR
- range: {x: 155, y: 155}
- isOutRange: 0
+ paramType: 0
+ comparisonType: 2
+ threshold: 100
- name: "\u6563\u70ED"
- property: HEAT
- range: {x: 100, y: 155}
- isOutRange: 0
- extraConditions:
+ paramType: 2
+ comparisonType: 3
+ threshold: 100
- name: "\u566A\u97F3"
- property: NOISE
- range: {x: 10, y: 150}
- isOutRange: 0
+ paramType: 1
+ comparisonType: 3
+ threshold: 100
diff --git a/Assets/Scripts/FixSystemNew/Screen System/FixPanel/BlockPuzzlePart.cs b/Assets/Scripts/FixSystemNew/Screen System/FixPanel/BlockPuzzlePart.cs
index 43a740f3b..00a944010 100644
--- a/Assets/Scripts/FixSystemNew/Screen System/FixPanel/BlockPuzzlePart.cs
+++ b/Assets/Scripts/FixSystemNew/Screen System/FixPanel/BlockPuzzlePart.cs
@@ -16,16 +16,29 @@ namespace AibisDream.FixSystem
// ------------------------ 进度条 -------------------------
// [Header("进度条")]
- // [SerializeField] private ProgressBar _powerProgressBar;
- // [SerializeField] private ProgressBar _noiseProgressBar;
- // [SerializeField] private ProgressBar _heatProgressBar;
+ [SerializeField] private SpriteProgressBar powerProgressBar;
+ [SerializeField] private SpriteProgressBar noiseProgressBar;
+ [SerializeField] private SpriteProgressBar heatProgressBar;
- public void OnProgressChanged(BlockPuzzleParamValue paramValue)
+ ///
+ /// 设置进度条最大值
+ ///
+ ///
+ public void SetProgressMaxValue(BlockPuzzleParamValue paramValue)
{
+ powerProgressBar.MaxValue = paramValue.power;
+ noiseProgressBar.MaxValue = paramValue.noise;
+ heatProgressBar.MaxValue = paramValue.heat;
+ }
+
+ public void OnProgressChanged(ValidateResult validateResult)
+ {
+
+ var paramValue = validateResult.propValue;
// 更新进度条
- // _powerProgressBar.CurrentValue = paramValue.power;
- // _noiseProgressBar.CurrentValue = paramValue.noise;
- // _heatProgressBar.CurrentValue = paramValue.heat;
+ powerProgressBar.CurrentValue = paramValue.power;
+ noiseProgressBar.CurrentValue = paramValue.noise;
+ heatProgressBar.CurrentValue = paramValue.heat;
// TODO 更新通过情况
@@ -42,11 +55,17 @@ namespace AibisDream.FixSystem
[SerializeField] private RectTransform _deviceButtonRoot;
[SerializeField] private GameObject _deviceItemPrefab;
+ private BlockShapeData[] deviceButtonDatas;
+ public BlockShapeData[] DeviceButtonDatas { set => deviceButtonDatas = value; }
+
public event Action OnDeviceSelected;
private void InitDeviceList()
{
- // TODO: 初始化器件列表
+ foreach (var data in deviceButtonDatas)
+ {
+ AddDeviceButton(data.blockShapeInfo);
+ }
}
public void OnDeviceRecycle(BlockShape blockShape)
@@ -54,13 +73,6 @@ namespace AibisDream.FixSystem
AddDeviceButton(blockShape.BlockShapeData.blockShapeInfo);
}
- public void OnDeviceRemove(BlockShape blockShape)
- {
- // 从传送带获取器件时移除面板上的器件信息
- Destroy(blockShape.gameObject);
- RemoveDeviceButton(blockShape.BlockShapeData.shapeName);
- }
-
private void AddDeviceButton(BlockShapeInfo blockShapeInfo)
{
var button = Instantiate(_deviceItemPrefab, _deviceButtonRoot).GetComponent();
@@ -84,6 +96,11 @@ namespace AibisDream.FixSystem
public Button LockButton => lockButton;
public Button PopUpButton => popUpButton;
+ public void SetVaildState(ValidateResult validateResult)
+ {
+ lockButton.GetComponent().SetValidState(validateResult.isPass);
+ }
+
// ------------------------ 面板收放 -------------------------
public void Init()
{
diff --git a/Assets/Scripts/FixSystemNew/Screen System/UniversalScreen.cs b/Assets/Scripts/FixSystemNew/Screen System/UniversalScreen.cs
index be9628d36..c00e80821 100644
--- a/Assets/Scripts/FixSystemNew/Screen System/UniversalScreen.cs
+++ b/Assets/Scripts/FixSystemNew/Screen System/UniversalScreen.cs
@@ -10,7 +10,6 @@ namespace AibisDream.FixSystem
public class UniversalScreen : MonoBehaviour, ILineView
{
[Header("是否为对话容器")]
- [SerializeField] private bool IsLineView = false;
[SerializeField] private TerminalText logText;
[Header("其他字段")]
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleGrid.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleGrid.cs
index e08f8d0e2..65b841cb8 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleGrid.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleGrid.cs
@@ -15,7 +15,6 @@ namespace AibisDream
[SerializeField] public int width = 10;
[SerializeField] public int height = 10;
[SerializeField] public float cellSize = 1f;
- [SerializeField] private bool showCellStates = true;
private GridCellState[,] _grid;
private GridCellState[,] _previewGrid;
@@ -30,8 +29,6 @@ namespace AibisDream
public GridVisualizer GridVisualizer { get; private set; }
public Dictionary ShapeDict { get; private set; }
- public event Action OnShapePlaced;
-
///
/// 初始化编辑器预览
///
@@ -269,11 +266,6 @@ namespace AibisDream
{
return ShapeDict.Keys.ToList();
}
-
- private void OnDestroy()
- {
- OnShapePlaced = null;
- }
}
}
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleKit.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleKit.cs
index 0a0fde61a..d25703319 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleKit.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleKit.cs
@@ -100,6 +100,74 @@ namespace AibisDream
}
}
+ ///
+ /// 批量从文件加载 BlockShapeData
+ ///
+ /// 要加载的数据键数组
+ /// 文件路径，如果为空则使用默认路径
+ /// 成功加载的数据列表
+ public static Dictionary LoadBlockShapeDataBatch(string[] keys, string path = null)
+ {
+ var result = new Dictionary();
+
+ if (keys == null || keys.Length == 0)
+ {
+ return result;
+ }
+
+ if (string.IsNullOrEmpty(path))
+ {
+ path = ConstRef.BlockShapeDataPath;
+ }
+
+ try
+ {
+ if (!File.Exists(path))
+ {
+ Debug.LogWarning($"BlockShapeData 文件不存在: {path}");
+ return result;
+ }
+
+ var dict = JsonUtil.ReadBeanDict(path);
+ var infoDict = JsonUtil.ReadBeanDict(ConstRef.BlockShapeInfoPath);
+
+ if (dict == null)
+ {
+ Debug.LogWarning($"读取 BlockShapeData 字典失败: {path}");
+ return result;
+ }
+
+ foreach (string key in keys)
+ {
+ if (string.IsNullOrEmpty(key))
+ continue;
+
+ if (dict.ContainsKey(key))
+ {
+ BlockShapeData data = dict[key];
+
+ // 尝试加载对应的 BlockShapeInfo
+ if (infoDict != null && infoDict.ContainsKey(key))
+ {
+ data.blockShapeInfo = infoDict[key];
+ }
+
+ result.Add(key, data);
+ }
+ else
+ {
+ Debug.LogWarning($"未找到键为 '{key}' 的 BlockShapeData");
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ Debug.LogError($"批量加载 BlockShapeData 失败: {e.Message}");
+ }
+
+ return result;
+ }
+
///
/// 从文件加载单个 BlockPuzzleData
///
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzlePanel.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzlePanel.cs
index 9bd5d4419..4e818614e 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzlePanel.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzlePanel.cs
@@ -1,7 +1,5 @@
using UnityEngine;
using AibisDream.FixSystem;
-using System;
-using UnityEngine.Events;
namespace AibisDream
{
@@ -12,6 +10,14 @@ namespace AibisDream
[SerializeField] private UniversalScreen blockPuzzleScreen;
[SerializeField] private BlockPuzzlePart blockPuzzlePart;
+ // ---------------------- 基本功能 ----------------------
+
+ public void SwitchToLogScreen()
+ {
+ logScreen.gameObject.SetActive(true);
+ blockPuzzleScreen.gameObject.SetActive(false);
+ }
+
// ---------------------- 维修部分 ----------------------
public BlockPuzzlePart Panel => blockPuzzlePart;
@@ -26,11 +32,21 @@ namespace AibisDream
blockPuzzleScreen.SetText("设备名称", shape.shapeName);
blockPuzzleScreen.SetText("设备描述", shape.shapeDescription);
- blockPuzzleScreen.SetText("PWR", shape.paramValue.power.ToString());
- blockPuzzleScreen.SetText("NOISE", shape.paramValue.noise.ToString());
- blockPuzzleScreen.SetText("HEAT", shape.paramValue.heat.ToString());
+ blockPuzzleScreen.SetText("PWR", $"PWR\n{shape.paramValue.power.ToString("+0;-0;+0")}");
+ blockPuzzleScreen.SetText("NOISE", $"NOISE\n{shape.paramValue.noise.ToString("+0;-0;+0")}");
+ blockPuzzleScreen.SetText("HEAT", $"HEAT\n{shape.paramValue.heat.ToString("+0;-0;+0")}");
- // TODO: 设备状态后面实现
+ for (int i = 1; i <= 3; i++)
+ {
+ if (i <= shape.states.Length)
+ {
+ blockPuzzleScreen.SetText($"设备状态{i}", shape.states[i-1]);
+ }
+ else
+ {
+ blockPuzzleScreen.SetText($"设备状态{i}", "");
+ }
+ }
}
public void ClearShapeInScreen()
@@ -43,6 +59,11 @@ namespace AibisDream
blockPuzzleScreen.SetText("PWR", "0");
blockPuzzleScreen.SetText("NOISE", "0");
blockPuzzleScreen.SetText("HEAT", "0");
+
+ for (int i = 1; i <= 3; i++)
+ {
+ blockPuzzleScreen.SetText($"设备状态{i}", "");
+ }
}
// ---------------------- 对话功能 ----------------------
@@ -60,12 +81,12 @@ namespace AibisDream
private void OnEnable()
{
- DialogUIManager.Instance.RegisterScreenView(DialogViewType.Log, this);
+ DialogUIManager.Instance?.RegisterScreenView(DialogViewType.Log, this);
}
private void OnDisable()
{
- DialogUIManager.Instance.UnRegisterScreenView(DialogViewType.Log);
+ DialogUIManager.Instance?.UnRegisterScreenView(DialogViewType.Log);
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleSystem.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleSystem.cs
index d3cb5af4f..7d1944e99 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleSystem.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleSystem.cs
@@ -1,10 +1,11 @@
+using System;
using UnityEngine;
using Cinemachine;
using AibisDream.Kit;
using AibisDream.Utility;
using System.Linq;
using AibisDream.Framework;
-using System;
+using UnityEngine.EventSystems;
namespace AibisDream
{
@@ -24,6 +25,9 @@ namespace AibisDream
private BlockPuzzleValidator validator;
private ShapeFactory shapeFactory;
+ // 锁定状态
+ public bool IsLocked { get; private set; }
+
private void Start()
{
if (initializeOnStart)
@@ -48,53 +52,113 @@ namespace AibisDream
public void Initialize()
{
+ float startTime = Time.realtimeSinceStartup;
+
// 初始化网格
grid.Initialize(puzzleData.gridWidth, puzzleData.gridHeight, puzzleData.cellSize);
+
+ // 批量预加载所有需要的BlockShapeData，避免循环中重复读取JSON文件
+ var shapeKeys = puzzleData.gridShapeDataInfos.Select(s => s.shapeKey).Distinct().ToArray();
+ var shapeDataDict = BlockPuzzleKit.LoadBlockShapeDataBatch(shapeKeys);
+
// 初始化网格上图形
shapeFactory = new ShapeFactory(shapeRoot);
foreach (var shapeData in puzzleData.gridShapeDataInfos)
{
- var shape = shapeFactory.CreateBlockShape(shapeData.shapeKey);
- shape.Rotate(shapeData.rotationAngle);
- grid.TrySnapToGrid(shape, shapeData.rootCell);
- shape.GetComponent().IsDraggable = shapeData.isDraggable;
+ // 使用预加载的数据创建形状，避免重复读取JSON
+ if (shapeDataDict.TryGetValue(shapeData.shapeKey, out var blockShapeData))
+ {
+ var shape = shapeFactory.CreateBlockShape(blockShapeData);
+ shape.Rotate(shapeData.rotationAngle);
+ grid.TrySnapToGrid(shape, shapeData.rootCell);
+ shape.ShapeDragger.IsDraggable = shapeData.isDraggable;
+ }
}
-
grid.GridVisualizer.UpdateAllCellsVisual();
// 加载验证器
validator = ResourceKit.LoadAssetSync(puzzleData.validatorName);
+ blockPuzzlePanel.Panel.SetProgressMaxValue(validator.CollectThresholds());
+
+ // 初始化侧边栏
+ var deviceDatas = BlockPuzzleKit.LoadBlockShapeDataBatch(puzzleData.shapeInRack);
+ blockPuzzlePanel.Panel.DeviceButtonDatas = deviceDatas.Values.ToArray();
+
// 组装事件逻辑
AssembleEventLogic();
- Debug.Log("网格系统初始化完成");
- }
+ // 初始化时验证一次
+ validator.Validate(grid.GetShapes());
- private void PreCheckGameState()
- {
- var shapes = grid.GetShapes();
- var validateResult = validator.Validate(shapes);
+ // 确保交互状态正确
+ UpdateInteractionState();
}
private void SubmitGameResult()
{
- var shapes = grid.GetShapes();
- var validateResult = validator.Validate(shapes);
+ // 检查系统是否锁定
+ if (IsLocked)
+ {
+ return;
+ }
+
+ var validateResult = validator.Validate(grid.GetShapes());
// 如果验证通过, 则设置变量并弹出对话
if (validateResult.isPass)
{
- StorageSystem.Instance.SetValue("$block_puzzle_pass", true);
- DialogController.Instance.StartDialogNode("方块拼图完成");
+ // StorageSystem.Instance.SetValue("$block_puzzle_pass", true);
+ // DialogController.Instance.StartDialogNode("方块拼图完成");
+
+ Debug.Log("方块拼图完成");
}
}
public void ClearGame()
{
grid.Clear();
- // shapeRack.Clear();
shapeRoot.DestroyAllChildren();
+ // 重置锁定状态
+ SetLocked(false);
+ }
+
+ // --------------------- 锁定状态管理 -------------------
+
+ ///
+ /// 设置系统锁定状态
+ ///
+ /// 是否锁定
+ public void SetLocked(bool locked)
+ {
+ IsLocked = locked;
+ UpdateInteractionState();
+ }
+
+ ///
+ /// 更新所有交互组件的状态
+ ///
+ private void UpdateInteractionState()
+ {
+ // 更新所有形状的拖拽状态
+ if (shapeFactory != null)
+ {
+ shapeFactory.SetAllShapesDraggable(!IsLocked);
+ }
+
+ // 更新按钮的交互状态
+ if (blockPuzzlePanel != null && blockPuzzlePanel.Panel != null)
+ {
+ var panel = blockPuzzlePanel.Panel;
+ if (panel.LockButton != null)
+ {
+ panel.LockButton.interactable = !IsLocked;
+ }
+ if (panel.PopUpButton != null)
+ {
+ panel.PopUpButton.interactable = !IsLocked;
+ }
+ }
}
// --------------------- 维修面板同步 -------------------
@@ -111,13 +175,14 @@ namespace AibisDream
blockPuzzlePanel.Panel.OnSubmit.AddListener(SubmitGameResult);
blockPuzzlePanel.Panel.OnPopUp.AddListener(PopUpShape);
- // 由网格触发
- grid.OnShapePlaced += PreCheckGameState;
-
// 由Shape触发
shapeFactory.OnDragStart += OnShapeDragStart;
shapeFactory.OnDragEnd += OnShapeDragEnd;
shapeFactory.OnDragUpdate += OnShapeDragUpdate;
+
+ // 由系统触发
+ validator.OnValidate.AddListener(blockPuzzlePanel.Panel.SetVaildState);
+ validator.OnValidate.AddListener(blockPuzzlePanel.Panel.OnProgressChanged);
}
private void OnPanelShapeSelected(BlockShapeInfo shapeData)
@@ -127,28 +192,31 @@ namespace AibisDream
blockPuzzlePanel.ShowShapeInScreen(shapeData);
}
- public void OnValidateResult(ValidateResult validateResult)
- {
- // 先更新进度条
-
- // 再更新校验结果，包括锁定按钮等UI
-
- }
-
public void OnShapeDragStart(IBlockShape blockShape)
{
- // 更新选中图形
+ // 显示Info
+ if (blockShape is BlockShape shape && shape.BlockShapeData.blockShapeInfo.shapeName != null)
+ {
+ blockPuzzlePanel.ShowShapeInScreen(shape.BlockShapeData.blockShapeInfo);
+ EventSystem.current.SetSelectedGameObject(null);
+ selectedShapeName = null;
+ }
// 回收抽屉高亮，半开
shapeRecycleSlot.PreRecycle();
shapeRecycleSlot.SetRecycleAvaliable(true);
+
+ // 每次拿起时也要校验
+ validator.Validate(grid.GetShapes());
}
public void OnShapeDragEnd(IBlockShape blockShape, bool isPlaced)
{
- //
-
- // TODO: 如果吸附到回收处，应该播放动画，并提示回收成功
+ // 如果放置成功，则预先检查一次
+ if (isPlaced)
+ {
+ validator.Validate(grid.GetShapes());
+ }
}
public void OnShapeDragUpdate(IBlockShape blockShape)
@@ -159,6 +227,12 @@ namespace AibisDream
public void PopUpShape()
{
+ // 检查系统是否锁定
+ if (IsLocked)
+ {
+ return;
+ }
+
if (selectedShapeName == null)
{
return;
@@ -172,7 +246,6 @@ namespace AibisDream
// 删除按钮
blockPuzzlePanel.Panel.RemoveDeviceButton(selectedShapeName);
selectedShapeName = null;
- blockPuzzlePanel.ClearShapeInScreen();
}
// --------------------- 吸附校验 ---------------------
@@ -183,7 +256,10 @@ namespace AibisDream
if (shapeRecycleSlot.CurrentState == PositionState.Open)
{
shapeRecycleSlot.RecycleShape(blockShape);
- // TODO: 向面板添加回收的形状
+ // 清空屏幕并切换回LogScreen
+ blockPuzzlePanel.ClearShapeInScreen();
+ blockPuzzlePanel.SwitchToLogScreen();
+ // 向面板添加回收的形状
blockPuzzlePanel.Panel.OnDeviceRecycle(blockShape);
// 延时后进行销毁
ActionKit.Delay(1.0f, () => {
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleValidator.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleValidator.cs
index b4771d9bc..e8eefcdee 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleValidator.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockPuzzleValidator.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-using System.Linq;
using UnityEngine;
+using UnityEngine.Events;
namespace AibisDream
{
@@ -10,6 +10,8 @@ namespace AibisDream
[Tooltip("基础条件, 不满足无法提交")]
public ValidateItem[] baseConditions;
+ public UnityEvent OnValidate = new();
+
///
/// 验证是否可以完成拼图
///
@@ -49,6 +51,7 @@ namespace AibisDream
result.isPass = result.isPass && itemResult;
}
+ OnValidate.Invoke(result);
return result;
}
@@ -69,6 +72,49 @@ namespace AibisDream
};
}
+ ///
+ /// 收集Power, Noise, Heat的阈值，并以BlockPuzzleParamValue的形式返回
+ ///
+ /// 包含各参数阈值的BlockPuzzleParamValue结构
+ public BlockPuzzleParamValue CollectThresholds()
+ {
+ var thresholds = new BlockPuzzleParamValue();
+
+ if (baseConditions == null)
+ return thresholds;
+
+ // 遍历所有条件，收集每个参数类型的阈值
+ // 如果同一参数类型有多个条件，取第一个匹配的阈值
+ bool powerFound = false;
+ bool noiseFound = false;
+ bool heatFound = false;
+
+ foreach (var condition in baseConditions)
+ {
+ if (!powerFound && condition.paramType == ParamType.Power)
+ {
+ thresholds.power = condition.threshold;
+ powerFound = true;
+ }
+ else if (!noiseFound && condition.paramType == ParamType.Noise)
+ {
+ thresholds.noise = condition.threshold;
+ noiseFound = true;
+ }
+ else if (!heatFound && condition.paramType == ParamType.Heat)
+ {
+ thresholds.heat = condition.threshold;
+ heatFound = true;
+ }
+
+ // 如果所有参数类型都已找到，可以提前退出
+ if (powerFound && noiseFound && heatFound)
+ break;
+ }
+
+ return thresholds;
+ }
+
[System.Serializable]
public struct ValidateItem
{
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs
index d4414353c..80b05b013 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
using AibisDream.Utility;
using UnityEngine;
@@ -58,7 +57,6 @@ namespace AibisDream
ShapeDragger = GetComponent();
_blockShapeData = blockShapeData;
gameObject.name = blockShapeData.shapeName;
- // 加载视觉Prefab
LoadVisualPrefab();
// 更新碰撞体
UpdatePolygonCollider();
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/GridVisualizer.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/GridVisualizer.cs
index 19bfe26d5..0747d2743 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/GridVisualizer.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/GridVisualizer.cs
@@ -28,8 +28,8 @@ namespace AibisDream
[SerializeField] private Sprite cellSprite;
[SerializeField] private Material cellMaterial;
- [HideInInspector] public int sortingLayer;
- [HideInInspector] public int sortingOrder;
+ [SerializeField] private int sortingLayer;
+ [SerializeField] private int sortingOrder;
// 单元格可视化对象池
private Dictionary<(int x, int y), GameObject> _cellObjects = new Dictionary<(int x, int y), GameObject>();
@@ -126,6 +126,9 @@ namespace AibisDream
lineObj.transform.localPosition = Vector3.zero;
LineRenderer lineRenderer = lineObj.AddComponent();
+ lineRenderer.sortingLayerID = sortingLayer;
+ lineRenderer.sortingOrder = sortingOrder;
+
lineRenderer.useWorldSpace = true;
lineRenderer.positionCount = 2;
lineRenderer.SetPosition(0, start);
@@ -135,7 +138,8 @@ namespace AibisDream
lineRenderer.material = new Material(Shader.Find("Sprites/Default"));
lineRenderer.startColor = color;
lineRenderer.endColor = color;
- lineRenderer.sortingOrder = 0;
+ lineRenderer.sortingLayerID = sortingLayer;
+ lineRenderer.sortingOrder = sortingOrder;
}
///
@@ -166,6 +170,8 @@ namespace AibisDream
cellObj.transform.position = _grid.GridToWorld(x, y);
SpriteRenderer spriteRenderer = cellObj.AddComponent();
+ spriteRenderer.sortingLayerID = sortingLayer;
+ spriteRenderer.sortingOrder = sortingOrder;
// 如果没有指定Sprite，创建一个简单的白色Sprite
if (cellSprite == null)
@@ -175,7 +181,8 @@ namespace AibisDream
spriteRenderer.sprite = cellSprite;
spriteRenderer.color = emptyCellColor;
- spriteRenderer.sortingOrder = 1;
+ spriteRenderer.sortingLayerID = sortingLayer;
+ spriteRenderer.sortingOrder = sortingOrder;
// 设置大小
float spriteSize = _grid.CellSize * 0.9f; // 稍微小一点，留出网格线空间
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/PlacementValidator.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/PlacementValidator.cs
index 0fa00a979..4c168fc2f 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/PlacementValidator.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/PlacementValidator.cs
@@ -183,6 +183,17 @@ namespace AibisDream
public float distance; // 到网格单元格的距离
public Vector2Int[] gridPositions; // 吸附后
public Vector2Int RootCell => new Vector2Int(gridX, gridY); // 吸附后的根网格坐标
- }
+
+ public static SnapResult RecycleResult => new()
+ {
+ canSnap = false,
+ snapPosition = Vector3.zero,
+ gridX = -10,
+ gridY = -10,
+ distance = float.MaxValue,
+ gridPositions = new Vector2Int[0]
+ };
+ };
}
+
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeDragger.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeDragger.cs
index 4f31b3c78..4f2b44455 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeDragger.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeDragger.cs
@@ -116,6 +116,8 @@ namespace AibisDream
if (recycled)
{
CurrentState = DragState.Idle;
+ _snapResult = SnapResult.RecycleResult;
+ TargetGrid.ShowSnapPreview(_snapResult);
return;
}
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeFactory.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeFactory.cs
index 801b37c99..d59f070b6 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeFactory.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeFactory.cs
@@ -75,5 +75,20 @@ namespace AibisDream
_blockShapeList.Remove(blockShape);
UnityEngine.Object.Destroy(blockShape.gameObject);
}
+
+ ///
+ /// 批量设置所有形状的可拖拽状态
+ ///
+ /// 是否可拖拽
+ public void SetAllShapesDraggable(bool draggable)
+ {
+ foreach (var shape in _blockShapeList)
+ {
+ if (shape != null && shape.ShapeDragger != null)
+ {
+ shape.ShapeDragger.IsDraggable = draggable;
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeRecycleSlot.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeRecycleSlot.cs
index c9dcc8f56..343517c8a 100644
--- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeRecycleSlot.cs
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/ShapeRecycleSlot.cs
@@ -4,11 +4,11 @@ namespace AibisDream
{
public class ShapeRecycleSlot : MonoBehaviour
{
-
public PositionState CurrentState => mover.GetCurrentState();
[SerializeField] private ThreeStatePositionMover mover;
[SerializeField] private BoxArea halfArea;
[SerializeField] private BoxArea openArea;
+ [SerializeField] private Transform attachPoint; // 吸附点，如果为空则吸附到(0,0)
// ----------------------- 回收逻辑 -----------------------
public void PreRecycle()
@@ -87,12 +87,23 @@ namespace AibisDream
}
}
}
-
+
private void PutShapeInSlot(BlockShape shape)
{
shape.transform.SetParent(mover.transform);
Vector3 centerPosition = shape.GetCenterPosition();
- shape.transform.localPosition = -centerPosition;
+
+ // 如果有配置吸附点，则吸附到吸附点；否则吸附到(0,0)
+ if (attachPoint != null)
+ {
+ // 吸附点挂在mover下面，直接使用本地坐标
+ shape.transform.localPosition = attachPoint.localPosition - centerPosition;
+ }
+ else
+ {
+ // 默认行为：吸附到(0,0)
+ shape.transform.localPosition = -centerPosition;
+ }
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs
new file mode 100644
index 000000000..8250e306b
--- /dev/null
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs
@@ -0,0 +1,53 @@
+using UnityEngine;
+using AibisDream.UI;
+using UnityEngine.Events;
+using UnityEngine.UI;
+
+namespace AibisDream
+{
+ public class BlockSubmitHander : MonoBehaviour
+ {
+ [Header("图片索引")]
+ [SerializeField] private SpriteTint validAsset;
+ [SerializeField] private SpriteTint invalidAsset;
+
+ private bool _validState = false;
+ private BaseButton submitButton;
+ private Image submitButtonImage;
+ public UnityEvent OnClick => submitButton.onClick;
+
+ private void Awake()
+ {
+ submitButtonImage = GetComponent();
+ submitButton = GetComponent();
+ submitButton.onStateTransition.AddListener(OnStateTransition);
+ }
+
+ private void OnStateTransition(SelectionType stateTransition, bool instant)
+ {
+ switch (stateTransition)
+ {
+ case SelectionType.Normal:
+ submitButtonImage.sprite = _validState ? validAsset.normalSprite : invalidAsset.normalSprite;
+ break;
+ case SelectionType.Highlighted:
+ submitButtonImage.sprite = _validState ? validAsset.highlightedSprite : invalidAsset.highlightedSprite;
+ break;
+ case SelectionType.Pressed:
+ submitButtonImage.sprite = _validState ? validAsset.pressedSprite : invalidAsset.pressedSprite;
+ break;
+ case SelectionType.Selected:
+ submitButtonImage.sprite = _validState ? validAsset.selectedSprite : invalidAsset.selectedSprite;
+ break;
+ case SelectionType.Disabled:
+ submitButtonImage.sprite = _validState ? validAsset.disabledSprite : invalidAsset.disabledSprite;
+ break;
+ }
+ }
+
+ public void SetValidState(bool valid)
+ {
+ _validState = valid;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs.meta b/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs.meta
new file mode 100644
index 000000000..2dd5681f7
--- /dev/null
+++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/BlockSubmitHander.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: df5a7683c04d2a04b84b5fc5f02d2306
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/SignLightHandler.cs b/Assets/Scripts/UI/Components/SignLightHandler.cs
similarity index 100%
rename from Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/SignLightHandler.cs
rename to Assets/Scripts/UI/Components/SignLightHandler.cs
diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/SignLightHandler.cs.meta b/Assets/Scripts/UI/Components/SignLightHandler.cs.meta
similarity index 100%
rename from Assets/Scripts/MiniGame/BlockPuzzle/Class/UIHander/SignLightHandler.cs.meta
rename to Assets/Scripts/UI/Components/SignLightHandler.cs.meta
diff --git a/Assets/Scripts/UI/UIKit.cs b/Assets/Scripts/UI/UIKit.cs
index 25454dd23..c2e39f9f9 100644
--- a/Assets/Scripts/UI/UIKit.cs
+++ b/Assets/Scripts/UI/UIKit.cs
@@ -12,4 +12,14 @@ namespace AibisDream.UI
public Color selectedColor;
public Color disabledColor;
}
+
+ [Serializable]
+ public struct SpriteTint
+ {
+ public Sprite normalSprite;
+ public Sprite highlightedSprite;
+ public Sprite pressedSprite;
+ public Sprite selectedSprite;
+ public Sprite disabledSprite;
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Utility/JsonUtil.cs b/Assets/Scripts/Utility/JsonUtil.cs
index f54cda551..d6910ee74 100644
--- a/Assets/Scripts/Utility/JsonUtil.cs
+++ b/Assets/Scripts/Utility/JsonUtil.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -13,6 +13,21 @@ namespace AibisDream.Utility
{
public const string JsonSuffix = ".json";
+ // 缓存的 JsonSerializerSettings，优化性能
+ private static readonly JsonSerializerSettings _defaultSettings = new JsonSerializerSettings
+ {
+ // 禁用类型名称处理，提升性能
+ TypeNameHandling = TypeNameHandling.None,
+ // 使用默认的日期格式处理
+ DateFormatHandling = DateFormatHandling.IsoDateFormat,
+ // 忽略循环引用
+ ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+ // 注意：不设置 NullValueHandling，保持默认行为（Include），避免改变现有功能
+ };
+
+ // 缓存的 JsonSerializer 实例，用于字典反序列化优化
+ private static readonly JsonSerializer _cachedSerializer = JsonSerializer.Create(_defaultSettings);
+
///
/// 根据平台读取文件内容
///
@@ -95,7 +110,7 @@ namespace AibisDream.Utility
public static T ReadBean(string path)
{
string json = ReadFileText(path);
- return JsonConvert.DeserializeObject(json);
+ return JsonConvert.DeserializeObject(json, _defaultSettings);
}
public static T ReadBeanByText(string text)
@@ -104,7 +119,7 @@ namespace AibisDream.Utility
{
text = "{" + text + "}";
}
- return JsonConvert.DeserializeObject(text);
+ return JsonConvert.DeserializeObject(text, _defaultSettings);
}
///
@@ -116,7 +131,7 @@ namespace AibisDream.Utility
public static T[] ReadBeanArray(string path)
{
string json = ReadFileText(path);
- return JsonConvert.DeserializeObject(json);
+ return JsonConvert.DeserializeObject(json, _defaultSettings);
}
///
@@ -128,7 +143,14 @@ namespace AibisDream.Utility
public static Dictionary ReadBeanDict(string path)
{
string json = ReadFileText(path);
- return JsonConvert.DeserializeObject>(json);
+
+ // 使用缓存的 JsonSerializerSettings 和 StringReader 优化性能
+ using (var reader = new StringReader(json))
+ using (var jsonReader = new JsonTextReader(reader))
+ {
+ var result = _cachedSerializer.Deserialize>(jsonReader);
+ return result;
+ }
}
///
diff --git a/Assets/StreamingAssets/LevelData/BlockPuzzle/BlockShapeInfo.json b/Assets/StreamingAssets/LevelData/BlockPuzzle/BlockShapeInfo.json
index d23d6b31f..3179316fa 100644
--- a/Assets/StreamingAssets/LevelData/BlockPuzzle/BlockShapeInfo.json
+++ b/Assets/StreamingAssets/LevelData/BlockPuzzle/BlockShapeInfo.json
@@ -1,22 +1,25 @@
-{
+{
"共鸣腔": {
"shapeName": "共鸣腔",
"shapeDescription": "共鸣腔描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 50,
+ "noise": 10,
+ "heat": 10
},
- "states": ["正常", "故障"],
+ "states": [
+ "正常",
+ "故障"
+ ],
"buttonImagePath": "BlockPuzzle/按钮缩略图[共鸣腔]"
},
"动平衡飞轮组": {
"shapeName": "动平衡飞轮组",
"shapeDescription": "动平衡飞轮组描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
"states": [
"正常",
@@ -28,20 +31,23 @@
"shapeName": "惯性稳压器",
"shapeDescription": "惯性稳压器描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
- "states": ["正常", "故障"],
+ "states": [
+ "正常",
+ "故障"
+ ],
"buttonImagePath": "BlockPuzzle/按钮缩略图[惯性稳压器]"
},
"进气系统": {
"shapeName": "进气系统",
"shapeDescription": "进气系统描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
"states": [
"正常",
@@ -53,9 +59,9 @@
"shapeName": "辅助涡轮",
"shapeDescription": "辅助涡轮描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
"states": [
"正常",
@@ -67,9 +73,9 @@
"shapeName": "散热条",
"shapeDescription": "散热条描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
"states": [
"正常",
@@ -81,33 +87,42 @@
"shapeName": "散热系统",
"shapeDescription": "散热系统描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
- "states": ["正常", "故障"],
+ "states": [
+ "正常",
+ "故障"
+ ],
"buttonImagePath": "BlockPuzzle/按钮缩略图[散热系统]"
},
"旧动力核心": {
"shapeName": "旧动力核心",
"shapeDescription": "旧动力核心描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
- "states": ["正常", "故障"],
+ "states": [
+ "正常",
+ "故障"
+ ],
"buttonImagePath": "BlockPuzzle/按钮缩略图[旧动力核心]"
},
"新动力核心": {
"shapeName": "新动力核心",
"shapeDescription": "新动力核心描述",
"paramValue": {
- "power": 100,
- "noise": 100,
- "heat": 100
+ "power": 10,
+ "noise": 10,
+ "heat": 10
},
- "states": ["正常", "故障"],
+ "states": [
+ "正常",
+ "故障"
+ ],
"buttonImagePath": "BlockPuzzle/按钮缩略图[新动力核心]"
}
}
\ No newline at end of file