【新手引导】更改引导流程、修改部分细节

iOS_release
zhangaotian 2024-07-25 19:27:22 +08:00
parent 7af8c4def4
commit 928c7a1cc0
41 changed files with 1452 additions and 1206 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6948c37e7c7b04c07b0920163e7e65ac guid: ef68720f4357641e7a44894eef1f0e9c
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4328509b70e7941bd917ac2c5f68117a guid: c2b372e9112404a4eaf22997efa6b10a
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 016ae8ac0b6994d499fa8cc609b017ac guid: 25b0e4fb78cf44c4ab2397805b21db2a
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 24e9f1cf13925478197d672b80640be0 guid: 3a0437009c7c649b4b40e60a9e37a761
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 22ddf2d6443fa4b0ea614eb94ecaba41 guid: f7cad08d8a066468cbecc8a865155f58
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 88 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 13bff0fa8528c4e6c95d0a00eb890a20 guid: 4b6f6774f44b84ffd8037ee8eb821037
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

View File

@ -31,7 +31,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 1 value: 1
inSlope: -0 inSlope: -0
outSlope: 0 outSlope: 0
@ -61,7 +61,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 1 value: 1
inSlope: -0 inSlope: -0
outSlope: 0 outSlope: 0
@ -85,15 +85,15 @@ AnimationClip:
time: 0 time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0.083333336 outSlope: 0.016689846
tangentMode: 69 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 1 value: 1
inSlope: 0.083333336 inSlope: 0.016689846
outSlope: 30.000029 outSlope: 30.000029
tangentMode: 69 tangentMode: 69
weightedMode: 0 weightedMode: 0
@ -121,7 +121,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 0 value: 0
inSlope: -0 inSlope: -0
outSlope: 30.000029 outSlope: 30.000029
@ -187,7 +187,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 12 m_StopTime: 59.916668
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
@ -217,7 +217,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 1 value: 1
inSlope: -0 inSlope: -0
outSlope: 0 outSlope: 0
@ -247,7 +247,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 1 value: 1
inSlope: -0 inSlope: -0
outSlope: 0 outSlope: 0
@ -271,15 +271,15 @@ AnimationClip:
time: 0 time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0.083333336 outSlope: 0.016689846
tangentMode: 69 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 1 value: 1
inSlope: 0.083333336 inSlope: 0.016689846
outSlope: 30.000029 outSlope: 30.000029
tangentMode: 69 tangentMode: 69
weightedMode: 0 weightedMode: 0
@ -307,7 +307,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 12 time: 59.916668
value: 0 value: 0
inSlope: -0 inSlope: -0
outSlope: 30.000029 outSlope: 30.000029

View File

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -10, y: 877} m_AnchoredPosition: {x: -10, y: 630}
m_SizeDelta: {x: 800, y: 200} m_SizeDelta: {x: 800, y: 200}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &366020088593063643 --- !u!222 &366020088593063643
@ -274,9 +274,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 370, y: -659} m_AnchoredPosition: {x: 420, y: -709.5}
m_SizeDelta: {x: 100, y: 101} m_SizeDelta: {x: 100, y: 101}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 1, y: 0}
--- !u!222 &8504618897260208688 --- !u!222 &8504618897260208688
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -6,7 +6,7 @@
"unlockConditionType": 0, "unlockConditionType": 0,
"unlockInfos": [ "unlockInfos": [
{ {
"condition": 0, "condition": 1,
"conditionGroup": 5 "conditionGroup": 5
}, },
{ {

View File

@ -3,10 +3,10 @@
"ID": 101, "ID": 101,
"NextID": 102, "NextID": 102,
"GroupID": 1, "GroupID": 1,
"GuideNote": "点击岛屿", "GuideNote": "点击泡泡按钮",
"GuideDesKey": "Guide_101", "GuideDesKey": "Guide_101",
"GuideType": 0, "GuideType": 0,
"GuideParams": "BuildRoot/Node5/Option1/Normal", "GuideParams": "BuildRoot/Node5/Btn",
"GuideCompleteType": 0, "GuideCompleteType": 0,
"GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar" "GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar"
}, },
@ -14,55 +14,77 @@
"ID": 102, "ID": 102,
"NextID": 103, "NextID": 103,
"GroupID": 1, "GroupID": 1,
"GuideNote": "更换建造物",
"GuideDesKey": "Guide_102",
"GuideType": 0,
"GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item2/Img_Item",
"GuideCompleteType": 3,
"GuideCompleteParams": "BuildRoot/Node5/Option2/Normal"
},
{
"ID": 103,
"NextID": 104,
"GroupID": 1,
"GuideNote": "保存更改",
"GuideDesKey": "Guide_103",
"GuideType": 0,
"GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Btn_Yes",
"GuideCompleteType": 1,
"GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar"
},
{
"ID": 104,
"NextID": 105,
"GroupID": 1,
"GuideNote": "点击泡泡按钮",
"GuideDesKey": "Guide_104",
"GuideType": 0,
"GuideParams": "BuildRoot/Node1/Btn",
"GuideCompleteType": 0,
"GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar"
},
{
"ID": 105,
"NextID": 106,
"GroupID": 1,
"GuideNote": "点击上锁图标", "GuideNote": "点击上锁图标",
"GuideDesKey": "Guide_105", "GuideDesKey": "Guide_102",
"GuideType": 0, "GuideType": 0,
"GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item1/Img_Lock", "GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item1/Img_Lock",
"GuideCompleteType": 0, "GuideCompleteType": 0,
"GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/Build_Tip" "GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/Build_Tip"
}, },
{ {
"ID": 106, "ID": 103,
"NextID": -1, "NextID": 104,
"GroupID": 1, "GroupID": 1,
"GuideNote": "点击开始游戏", "GuideNote": "点击开始游戏",
"GuideDesKey": "Guide_106", "GuideDesKey": "Guide_103",
"GuideType": 0, "GuideType": 0,
"GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/Build_Tip/Btn_Game", "GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/Build_Tip/Btn_Game",
"GuideCompleteType": 2, "GuideCompleteType": 2,
"GuideCompleteParams": "" "GuideCompleteParams": ""
},
{
"ID": 104,
"NextID": 105,
"GroupID": 1,
"GuideNote": "完成关卡",
"GuideDesKey": "Guide_104",
"GuideType": 1,
"GuideParams": "",
"GuideCompleteType": 3,
"GuideCompleteParams": "level1"
},
{
"ID": 105,
"NextID": 106,
"GroupID": 1,
"GuideNote": "返回主界面",
"GuideDesKey": "Guide_105",
"GuideType": 0,
"GuideParams": "Panel_Win/Btn_Back",
"GuideCompleteType": 5,
"GuideCompleteParams": ""
},
{
"ID": 106,
"NextID": 107,
"GroupID": 1,
"GuideNote": "点击岛屿",
"GuideDesKey": "Guide_106",
"GuideType": 0,
"GuideParams": "BuildRoot/Node5/Option1/Normal",
"GuideCompleteType": 0,
"GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar"
},
{
"ID": 107,
"NextID": 108,
"GroupID": 1,
"GuideNote": "更换岛屿",
"GuideDesKey": "Guide_107",
"GuideType": 0,
"GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item2/Img_Item",
"GuideCompleteType": 4,
"GuideCompleteParams": "BuildRoot/Node5/Option2/Normal"
},
{
"ID": 108,
"NextID": -1,
"GroupID": 1,
"GuideNote": "点击保存",
"GuideDesKey": "Guide_108",
"GuideType": 0,
"GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Btn_Yes",
"GuideCompleteType": 1,
"GuideCompleteParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar"
} }
] ]

View File

@ -362,37 +362,49 @@
{ {
"ID": 161, "ID": 161,
"Key": "Guide_101", "Key": "Guide_101",
"Value": "点击岛屿",
"Value_En": "Click island"
},
{
"ID": 162,
"Key": "Guide_102",
"Value": "更换岛屿",
"Value_En": "Replace island"
},
{
"ID": 163,
"Key": "Guide_103",
"Value": "保存更改",
"Value_En": "Save changes"
},
{
"ID": 164,
"Key": "Guide_104",
"Value": "点击泡泡按钮", "Value": "点击泡泡按钮",
"Value_En": "Click bubble button" "Value_En": "Click bubble button"
}, },
{ {
"ID": 165, "ID": 162,
"Key": "Guide_105", "Key": "Guide_102",
"Value": "点击未解锁的建造", "Value": "点击未解锁的建造",
"Value_En": "Click unlocked build" "Value_En": "Click unlocked build"
}, },
{
"ID": 163,
"Key": "Guide_103",
"Value": "开始闯关!",
"Value_En": "Start Game!"
},
{
"ID": 164,
"Key": "Guide_104",
"Value": "",
"Value_En": ""
},
{
"ID": 165,
"Key": "Guide_105",
"Value": "回到我的岛屿",
"Value_En": "Back to island"
},
{ {
"ID": 166, "ID": 166,
"Key": "Guide_106", "Key": "Guide_106",
"Value": "开始游戏!", "Value": "点击岛屿",
"Value_En": "Start Game!" "Value_En": "Click island"
},
{
"ID": 167,
"Key": "Guide_107",
"Value": "更换岛屿",
"Value_En": "Replace island"
},
{
"ID": 168,
"Key": "Guide_108",
"Value": "保存更改",
"Value_En": "Save changes"
} }
] ]

View File

@ -69,4 +69,5 @@ QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm

View File

@ -907,6 +907,41 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontSize
value: 54
objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontStyle
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontColor.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontColor.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontSizeBase
value: 54
objectReference: {fileID: 0}
- target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_fontColor32.rgba
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 7644366489302203207, guid: e9c96c211fb08417084dbd9a3f85ab3c, - target: {fileID: 7644366489302203207, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3} type: 3}
propertyPath: m_text propertyPath: m_text
@ -1111,7 +1146,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 397456830} - component: {fileID: 397456830}
- component: {fileID: 397456832} - component: {fileID: 397456832}
- component: {fileID: 397456831} - component: {fileID: 397456833}
m_Layer: 10 m_Layer: 10
m_Name: Normal m_Name: Normal
m_TagString: Untagged m_TagString: Untagged
@ -1134,120 +1169,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 602695269} m_Father: {fileID: 602695269}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &397456831
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 397456829}
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.5, y: 0.5}
oldSize: {x: 1.89, y: 2.11}
newSize: {x: 1.89, y: 2.11}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.21499999, y: -0.42499998}
- {x: 0.52, y: -0.42}
- {x: 0.59999996, y: -0.39}
- {x: 0.695, y: -0.305}
- {x: 0.715, y: -0.275}
- {x: 0.755, y: -0.16499999}
- {x: 0.775, y: 0.01}
- {x: 0.825, y: 0.065}
- {x: 0.895, y: 0.265}
- {x: 0.945, y: 0.325}
- {x: 0.945, y: 0.465}
- {x: 0.91499996, y: 0.515}
- {x: 0.85999995, y: 0.53999996}
- {x: 0.655, y: 0.53}
- {x: 0.585, y: 0.49499997}
- {x: 0.565, y: 0.35999998}
- {x: 0.625, y: 0.285}
- {x: 0.69, y: 0.265}
- {x: 0.69, y: 0.17999999}
- {x: 0.59999996, y: 0.265}
- {x: 0.545, y: 0.285}
- {x: 0.53999996, y: 0.465}
- {x: 0.51, y: 0.53999996}
- {x: 0.41, y: 0.61}
- {x: 0.39999998, y: 0.715}
- {x: 0.385, y: 0.77}
- {x: 0.275, y: 0.825}
- {x: 0.21, y: 0.96}
- {x: 0.13, y: 1.035}
- {x: 0.08, y: 1.055}
- {x: -0.105, y: 1.055}
- {x: -0.17, y: 1.03}
- {x: -0.22999999, y: 0.96}
- {x: -0.295, y: 0.82}
- {x: -0.32999998, y: 0.79999995}
- {x: -0.34, y: 0.78999996}
- {x: -0.39, y: 0.745}
- {x: -0.465, y: 0.59499997}
- {x: -0.55, y: 0.48999998}
- {x: -0.59499997, y: 0.285}
- {x: -0.69, y: 0.225}
- {x: -0.89, y: 0.195}
- {x: -0.92499995, y: 0.14999999}
- {x: -0.945, y: 0.11}
- {x: -0.945, y: -0.085}
- {x: -0.9, y: -0.14}
- {x: -0.77, y: -0.19999999}
- {x: -0.71999997, y: -0.31}
- {x: -0.62, y: -0.39}
- {x: -0.55, y: -0.415}
- {x: -0.53999996, y: -0.565}
- {x: -0.48, y: -0.65}
- {x: -0.39999998, y: -0.66999996}
- {x: -0.21, y: -0.66999996}
- {x: -0.21, y: -0.885}
- {x: -0.205, y: -0.93}
- {x: -0.17, y: -0.98499995}
- {x: -0.13, y: -1.025}
- {x: -0.07, y: -1.055}
- {x: 0.085, y: -1.055}
- {x: 0.175, y: -0.98999995}
- {x: 0.205, y: -0.91499996}
- {x: 0.22, y: -0.65999997}
- - {x: -0.39499998, y: -0.5}
- {x: -0.39499998, y: -0.42499998}
- {x: -0.21499999, y: -0.42499998}
- {x: -0.21499999, y: -0.52}
- {x: -0.35999998, y: -0.52}
- {x: -0.37, y: -0.525}
m_UseDelaunayMesh: 0
--- !u!212 &397456832 --- !u!212 &397456832
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1289,17 +1210,137 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 4328509b70e7941bd917ac2c5f68117a, type: 3} m_Sprite: {fileID: 21300000, guid: c2b372e9112404a4eaf22997efa6b10a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 1.89, y: 2.11} m_Size: {x: 3.7, y: 4.16}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!60 &397456833
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 397456829}
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.5, y: 0.5}
oldSize: {x: 1.85, y: 2.08}
newSize: {x: 3.7, y: 4.16}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.34, y: -0.405}
- {x: 0.38, y: -0.29999998}
- {x: 0.37, y: -0.17}
- {x: 0.75, y: -0.17}
- {x: 0.78, y: -0.16}
- {x: 0.84499997, y: -0.105}
- {x: 0.87, y: -0.06}
- {x: 0.875, y: 0.099999994}
- {x: 0.84, y: 0.17999999}
- {x: 0.78999996, y: 0.22}
- {x: 0.685, y: 0.22}
- {x: 0.69, y: 0.325}
- {x: 0.835, y: 0.325}
- {x: 0.90999997, y: 0.38}
- {x: 0.92499995, y: 0.42}
- {x: 0.92499995, y: 0.615}
- {x: 0.84999996, y: 0.685}
- {x: 0.72999996, y: 0.715}
- {x: 0.71, y: 0.78}
- {x: 0.63, y: 0.835}
- {x: 0.48, y: 0.9}
- {x: 0.475, y: 0.92499995}
- {x: 0.45499998, y: 0.995}
- {x: 0.385, y: 1.04}
- {x: -0.185, y: 1.04}
- {x: -0.26, y: 0.98499995}
- {x: -0.32, y: 0.84499997}
- {x: -0.38, y: 0.82}
- {x: -0.45499998, y: 0.715}
- {x: -0.44, y: 0.59499997}
- {x: -0.375, y: 0.51}
- {x: -0.12, y: 0.505}
- {x: -0.105, y: 0.36499998}
- {x: -0.375, y: 0.37}
- {x: -0.78, y: 0.37}
- {x: -0.835, y: 0.345}
- {x: -0.875, y: 0.305}
- {x: -0.905, y: 0.24499999}
- {x: -0.905, y: 0.11}
- {x: -0.84, y: 0.02}
- {x: -0.53999996, y: -0.049999997}
- {x: -0.51, y: -0.11}
- {x: -0.47, y: -0.14}
- {x: -0.44, y: -0.16}
- {x: -0.415, y: -0.17}
- {x: 0.155, y: -0.19}
- {x: 0.14, y: -0.305}
- {x: -0.195, y: -0.565}
- {x: -0.31, y: -0.655}
- {x: -0.48, y: -0.63}
- {x: -0.565, y: -0.58}
- {x: -0.34, y: -0.58}
- {x: -0.285, y: -0.49499997}
- {x: -0.31, y: -0.39999998}
- {x: -0.37, y: -0.345}
- {x: -0.38, y: -0.25}
- {x: -0.45499998, y: -0.195}
- {x: -0.77, y: -0.205}
- {x: -0.79499996, y: -0.21499999}
- {x: -0.84, y: -0.255}
- {x: -0.87, y: -0.35}
- {x: -0.92499995, y: -0.39499998}
- {x: -0.92499995, y: -0.53}
- {x: -0.895, y: -0.58}
- {x: -0.69, y: -0.59}
- {x: -0.68, y: -0.675}
- {x: -0.60499996, y: -0.76}
- {x: -0.515, y: -0.79999995}
- {x: -0.42999998, y: -0.84}
- {x: -0.5, y: -1.015}
- {x: -0.49499997, y: -1.04}
- {x: -0.02, y: -1.04}
- {x: 0.08, y: -0.75}
- {x: 0.13499999, y: -0.635}
- {x: 0.24, y: -0.525}
m_UseDelaunayMesh: 0
--- !u!1 &425332462 --- !u!1 &425332462
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2271,7 +2312,7 @@ Transform:
m_GameObject: {fileID: 803246608} m_GameObject: {fileID: 803246608}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.229, y: 0, z: 0} m_LocalPosition: {x: -0.19, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -2972,7 +3013,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1225632191} - component: {fileID: 1225632191}
- component: {fileID: 1225632193} - component: {fileID: 1225632193}
- component: {fileID: 1225632192} - component: {fileID: 1225632194}
m_Layer: 10 m_Layer: 10
m_Name: Normal m_Name: Normal
m_TagString: Untagged m_TagString: Untagged
@ -2995,138 +3036,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 371625805} m_Father: {fileID: 371625805}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1225632192
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1225632190}
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.5, y: 0.5}
oldSize: {x: 4.755, y: 3.16}
newSize: {x: 4.755, y: 3.16}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.8824999, y: -0.815}
- {x: 2.1125, y: -0.815}
- {x: 2.1575, y: -0.81}
- {x: 2.2525, y: -0.695}
- {x: 2.2475, y: -0.61}
- {x: 2.2925, y: 0.04}
- {x: 2.3725, y: 0.17999999}
- {x: 2.3725, y: 0.53}
- {x: 2.3274999, y: 0.58}
- {x: 2.2725, y: 0.59499997}
- {x: 1.5625, y: 0.59499997}
- {x: 1.5625, y: 0.60499996}
- {x: 1.4925, y: 0.59999996}
- {x: 1.3225, y: 0.72999996}
- {x: 1.3425, y: 1.12}
- {x: 1.4074999, y: 1.135}
- {x: 1.5274999, y: 1.175}
- {x: 1.6125, y: 1.3249999}
- {x: 1.6075, y: 1.415}
- {x: 1.5174999, y: 1.55}
- {x: 1.4325, y: 1.5799999}
- {x: -0.8925, y: 1.5799999}
- {x: -0.9675, y: 1.5699999}
- {x: -1.0525, y: 1.54}
- {x: -1.1374999, y: 1.4}
- {x: -1.1075, y: 1.235}
- {x: -0.98249996, y: 1.14}
- {x: -0.9525, y: 1.15}
- {x: -0.9475, y: 0.96}
- {x: -0.8775, y: 0.78}
- {x: -1.4225, y: 0.78499997}
- {x: -1.4325, y: 0.775}
- {x: -2.3174999, y: 0.775}
- {x: -2.3374999, y: 0.78499997}
- {x: -2.3775, y: 0.745}
- {x: -2.3775, y: 0.65999997}
- {x: -2.3274999, y: 0.615}
- {x: -2.2525, y: 0.59499997}
- {x: -2.2275, y: 0.38}
- {x: -2.1725, y: 0.31}
- {x: -2.1675, y: 0.06}
- {x: -2.1025, y: -0.005}
- {x: -2.0325, y: 0}
- {x: -1.9775, y: 0.035}
- {x: -1.9675, y: 0.28}
- {x: -1.9325, y: 0.29}
- {x: -1.9325, y: -0.205}
- {x: -1.8824999, y: -0.235}
- {x: -1.8525, y: -0.22}
- {x: -1.8275, y: -0.17999999}
- {x: -1.6175, y: 0.29}
- {x: -1.6025, y: 0.28}
- {x: -1.6025, y: -0.17999999}
- {x: -1.5825, y: -0.19999999}
- {x: -1.5575, y: -0.21}
- {x: -1.5324999, y: -0.14999999}
- {x: -1.5425, y: -0.035}
- {x: -1.5024999, y: -0.14999999}
- {x: -1.4775, y: -0.44}
- {x: -1.4525, y: -0.59499997}
- {x: -1.4125, y: -0.695}
- {x: -1.3575, y: -0.745}
- {x: -1.2375, y: -0.79999995}
- {x: -1.2375, y: -0.965}
- {x: -1.1925, y: -1.04}
- {x: -1.1374999, y: -1.06}
- {x: -0.7475, y: -1.06}
- {x: -0.7075, y: -1.1899999}
- {x: -0.6125, y: -1.29}
- {x: -0.5525, y: -1.3149999}
- {x: -0.4775, y: -1.345}
- {x: 0.4075, y: -1.345}
- {x: 0.4075, y: -1.4399999}
- {x: 0.4425, y: -1.48}
- {x: 0.5125, y: -1.4699999}
- {x: 0.53749996, y: -1.425}
- {x: 0.53749996, y: -1.345}
- {x: 0.7775, y: -1.345}
- {x: 0.7625, y: -1.39}
- {x: 0.8325, y: -1.5699999}
- {x: 0.8775, y: -1.5749999}
- {x: 1.5274999, y: -1.5799999}
- {x: 1.6324999, y: -1.5799999}
- {x: 1.6925, y: -1.5749999}
- {x: 1.7425, y: -1.535}
- {x: 1.8125, y: -1.4549999}
- {x: 1.8325, y: -1.4}
m_UseDelaunayMesh: 0
--- !u!212 &1225632193 --- !u!212 &1225632193
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3168,17 +3077,141 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 5 m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 13bff0fa8528c4e6c95d0a00eb890a20, type: 3} m_Sprite: {fileID: 21300000, guid: 4b6f6774f44b84ffd8037ee8eb821037, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 4.755, y: 3.16} m_Size: {x: 9.42, y: 6.32}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!60 &1225632194
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1225632190}
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.5, y: 0.5}
oldSize: {x: 4.71, y: 3.16}
newSize: {x: 9.42, y: 6.32}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.86, y: -0.815}
- {x: 2.09, y: -0.815}
- {x: 2.1299999, y: -0.79999995}
- {x: 2.19, y: -0.75}
- {x: 2.22, y: -0.69}
- {x: 2.225, y: -0.61}
- {x: 2.245, y: -0.25}
- {x: 2.27, y: 0.04}
- {x: 2.345, y: 0.185}
- {x: 2.35, y: 0.26999998}
- {x: 2.35, y: 0.53}
- {x: 2.315, y: 0.575}
- {x: 2.2549999, y: 0.59999996}
- {x: 1.54, y: 0.59499997}
- {x: 1.54, y: 0.60499996}
- {x: 1.4649999, y: 0.59999996}
- {x: 1.3, y: 0.72999996}
- {x: 1.3199999, y: 1.12}
- {x: 1.385, y: 1.135}
- {x: 1.495, y: 1.185}
- {x: 1.545, y: 1.24}
- {x: 1.5749999, y: 1.3299999}
- {x: 1.5699999, y: 1.415}
- {x: 1.535, y: 1.49}
- {x: 1.49, y: 1.545}
- {x: 1.4, y: 1.5799999}
- {x: -0.91499996, y: 1.5799999}
- {x: -0.98999995, y: 1.5699999}
- {x: -1.0649999, y: 1.53}
- {x: -1.115, y: 1.475}
- {x: -1.145, y: 1.395}
- {x: -1.14, y: 1.3}
- {x: -1.105, y: 1.22}
- {x: -1, y: 1.145}
- {x: -0.97499996, y: 1.15}
- {x: -0.96999997, y: 0.96}
- {x: -0.95, y: 0.93}
- {x: -0.895, y: 0.78}
- {x: -2.2949998, y: 0.78}
- {x: -2.335, y: 0.765}
- {x: -2.34, y: 0.73499995}
- {x: -2.34, y: 0.675}
- {x: -2.32, y: 0.63}
- {x: -2.32, y: 0.505}
- {x: -2.2649999, y: 0.385}
- {x: -2.195, y: 0.31}
- {x: -2.185, y: 0.17999999}
- {x: -2.1399999, y: 0.14}
- {x: -2.085, y: 0.16}
- {x: -2.06, y: 0.17999999}
- {x: -2.055, y: 0.285}
- {x: -1.67, y: 0.29}
- {x: -1.67, y: 0.26}
- {x: -1.655, y: 0.22}
- {x: -1.5999999, y: 0.13499999}
- {x: -1.5849999, y: -0.02}
- {x: -1.535, y: -0.044999998}
- {x: -1.5, y: -0.44}
- {x: -1.485, y: -0.55}
- {x: -1.4499999, y: -0.66499996}
- {x: -1.38, y: -0.745}
- {x: -1.26, y: -0.79999995}
- {x: -1.26, y: -0.965}
- {x: -1.2149999, y: -1.04}
- {x: -1.16, y: -1.06}
- {x: -0.77, y: -1.06}
- {x: -0.72999996, y: -1.1899999}
- {x: -0.635, y: -1.29}
- {x: -0.5, y: -1.345}
- {x: 0.75, y: -1.345}
- {x: 0.78499997, y: -1.505}
- {x: 0.825, y: -1.555}
- {x: 0.85499996, y: -1.5749999}
- {x: 1.505, y: -1.5799999}
- {x: 1.61, y: -1.5799999}
- {x: 1.67, y: -1.5749999}
- {x: 1.7199999, y: -1.535}
- {x: 1.79, y: -1.4549999}
- {x: 1.81, y: -1.4}
m_UseDelaunayMesh: 0
--- !u!1 &1243376723 --- !u!1 &1243376723
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4313,7 +4346,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1959391995} - component: {fileID: 1959391995}
- component: {fileID: 1959391997} - component: {fileID: 1959391997}
- component: {fileID: 1959391996} - component: {fileID: 1959391998}
m_Layer: 10 m_Layer: 10
m_Name: Normal m_Name: Normal
m_TagString: Untagged m_TagString: Untagged
@ -4336,99 +4369,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 803246609} m_Father: {fileID: 803246609}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1959391996
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959391994}
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.5, y: 0.5}
oldSize: {x: 0.77, y: 2.71}
newSize: {x: 0.77, y: 2.71}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.21, y: -0.675}
- {x: 0.37, y: -0.45}
- {x: 0.385, y: -0.375}
- {x: 0.385, y: -0.065}
- {x: 0.315, y: -0.03}
- {x: 0.265, y: -0.035}
- {x: 0.26, y: 0.39999998}
- {x: 0.195, y: 0.48499998}
- {x: 0.265, y: 0.57}
- {x: 0.26, y: 1.2149999}
- {x: 0.24499999, y: 1.255}
- {x: 0.17999999, y: 1.3299999}
- {x: 0.14, y: 1.355}
- {x: -0.06, y: 1.355}
- {x: -0.14, y: 1.29}
- {x: -0.17, y: 1.2099999}
- {x: -0.175, y: 0.615}
- {x: -0.155, y: 0.55}
- {x: -0.105, y: 0.48}
- {x: -0.155, y: 0.505}
- {x: -0.21, y: 0.58}
- {x: -0.255, y: 0.59999996}
- {x: -0.35999998, y: 0.585}
- {x: -0.385, y: 0.545}
- {x: -0.385, y: 0.16}
- {x: -0.355, y: 0.12}
- {x: -0.35999998, y: -0.03}
- {x: -0.295, y: -0.089999996}
- {x: -0.175, y: -0.074999996}
- {x: -0.175, y: -0.565}
- {x: -0.16, y: -0.63}
- {x: -0.095, y: -0.705}
- {x: -0.07, y: -0.71}
- {x: -0.074999996, y: -1.26}
- {x: -0.055, y: -1.3149999}
- {x: -0.02, y: -1.35}
- {x: -0.005, y: -1.355}
- {x: 0.105, y: -1.355}
- {x: 0.16, y: -1.275}
- {x: 0.155, y: -0.885}
- {x: 0.17, y: -0.705}
- - {x: -0.22, y: 0.055}
- {x: -0.22, y: 0.125}
- {x: -0.17999999, y: 0.16}
- {x: -0.17, y: 0.185}
- {x: -0.175, y: 0.19999999}
- {x: -0.17999999, y: 0.049999997}
- {x: -0.21499999, y: 0.049999997}
m_UseDelaunayMesh: 0
--- !u!212 &1959391997 --- !u!212 &1959391997
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4470,17 +4410,94 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 3 m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: 24e9f1cf13925478197d672b80640be0, type: 3} m_Sprite: {fileID: 21300000, guid: 3a0437009c7c649b4b40e60a9e37a761, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 0.77, y: 2.71} m_Size: {x: 1.08, y: 5.42}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!60 &1959391998
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959391994}
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.5, y: 0.5}
oldSize: {x: 0.54, y: 2.71}
newSize: {x: 1.08, y: 5.42}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.099999994, y: -0.675}
- {x: 0.26, y: -0.45}
- {x: 0.26999998, y: -0.36499998}
- {x: 0.26999998, y: -0.074999996}
- {x: 0.205, y: -0.03}
- {x: 0.155, y: -0.04}
- {x: 0.14999999, y: 0.39999998}
- {x: 0.08, y: 0.48499998}
- {x: 0.13, y: 0.55}
- {x: 0.14, y: 0.575}
- {x: 0.155, y: 0.61}
- {x: 0.14999999, y: 1.2149999}
- {x: 0.145, y: 1.265}
- {x: 0.04, y: 1.355}
- {x: -0.145, y: 1.355}
- {x: -0.19999999, y: 1.3299999}
- {x: -0.265, y: 1.255}
- {x: -0.26999998, y: 1.235}
- {x: -0.26999998, y: 0.525}
- {x: -0.255, y: 0.435}
- {x: -0.26999998, y: 0.41}
- {x: -0.26999998, y: -0.635}
- {x: -0.205, y: -0.705}
- {x: -0.17999999, y: -0.71}
- {x: -0.17999999, y: -1.255}
- {x: -0.17, y: -1.295}
- {x: -0.13499999, y: -1.35}
- {x: -0.12, y: -1.355}
- {x: -0.01, y: -1.355}
- {x: 0.044999998, y: -1.29}
- {x: 0.044999998, y: -0.885}
- {x: 0.06, y: -0.705}
m_UseDelaunayMesh: 0
--- !u!1 &2030499010 --- !u!1 &2030499010
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -36,9 +36,9 @@ namespace Framework.Event
GuideMaskStart, //更换遮罩对象 GuideMaskStart, //更换遮罩对象
OpenUI, OpenUI,
CloseUI, CloseUI,
ChangeBuild, ChangeBuild, //更换建筑物
EnterGame, EnterGame, //进入关卡
BackToMain, //回到主界面
} }
} }
} }

View File

@ -117,6 +117,9 @@ public class BuildBoot : MonoBehaviour
private const string TipPath = "Bar_Tip"; private const string TipPath = "Bar_Tip";
private const string ConditionText = "Level\n{0}/{1}"; private const string ConditionText = "Level\n{0}/{1}";
private const string ItemName = "Item{0}"; private const string ItemName = "Item{0}";
private readonly Color _lockColor = new Color(152f / 255f, 0f, 0f);
private readonly Color _unlockColor = new Color(255f, 255f, 255f);
private Action<Option> _optionCallBack; private Action<Option> _optionCallBack;
public BuildBar(GameObject root) public BuildBar(GameObject root)
@ -132,6 +135,8 @@ public class BuildBoot : MonoBehaviour
_optionCallBack = callBack; _optionCallBack = callBack;
_bar.SetActive(true); _bar.SetActive(true);
_condition.text = string.Format(ConditionText, reachCondition, condition); _condition.text = string.Format(ConditionText, reachCondition, condition);
_condition.color = reachCondition < condition ? _lockColor : _unlockColor;
var content = _bar.transform.Find(ContentPath); var content = _bar.transform.Find(ContentPath);
var iconTemplate = _bar.transform.Find(IconItemTemplate); var iconTemplate = _bar.transform.Find(IconItemTemplate);
@ -468,7 +473,6 @@ public class BuildBoot : MonoBehaviour
var levelID = $"level{LevelSelectManager.Instance.CurPassLevelIndex + 1}"; var levelID = $"level{LevelSelectManager.Instance.CurPassLevelIndex + 1}";
if (LevelManager.Instance.IsLevelExist(levelID)) if (LevelManager.Instance.IsLevelExist(levelID))
{ {
DebugUtil.LogError("进入游戏一次");
GameStateManager.Instance.ChangeState(new LevelState(levelID)); GameStateManager.Instance.ChangeState(new LevelState(levelID));
EventManager.Instance.Send(EventManager.EventName.EnterGame); EventManager.Instance.Send(EventManager.EventName.EnterGame);
} }
@ -523,7 +527,7 @@ public class BuildBoot : MonoBehaviour
{ {
_uiMainBuild.SetActive(true); _uiMainBuild.SetActive(true);
if (_curBubble != null) if (_curBubble != null)
_curBubble.SetActive(false); _curBubble.SetActive(true);
} }
private void HideUI() private void HideUI()
@ -623,7 +627,7 @@ public class BuildBoot : MonoBehaviour
} }
_newOption = option; _newOption = option;
OutlinePickItem(option); OutlinePickItem(option);
//DebugUtil.LogError("点击了{0}节点的{1}选项", nodeName, option.OptionObj.name); //DebugUtil.LogError("点击了{0}节点的{1}选项", nodeName, option.OptionObj.name);

View File

@ -8,6 +8,7 @@ public abstract class GuideCompleteBase
/// 通用回调 /// 通用回调
/// </summary> /// </summary>
private readonly Action _completeAction; private readonly Action _completeAction;
public readonly DataGuide GuideCfg; public readonly DataGuide GuideCfg;
protected GuideCompleteBase(DataGuide dataGuide, Action completeCallback) protected GuideCompleteBase(DataGuide dataGuide, Action completeCallback)
@ -25,10 +26,9 @@ public abstract class GuideCompleteBase
/// 移除监听 /// 移除监听
/// </summary> /// </summary>
public abstract void RemoveListener(); public abstract void RemoveListener();
protected virtual void Complete() protected virtual void Complete()
{ {
DebugUtil.LogError("完成引导回调");
_completeAction?.Invoke(); _completeAction?.Invoke();
} }
} }
@ -107,4 +107,38 @@ internal sealed class EnterGame : GuideCompleteBase
{ {
EventManager.Instance.Unregister(EventManager.EventName.EnterGame, Complete); EventManager.Instance.Unregister(EventManager.EventName.EnterGame, Complete);
} }
}
internal sealed class FinishGame : GuideCompleteBase
{
public FinishGame(DataGuide dataGuide, Action completeCallback) : base(dataGuide, completeCallback)
{
}
public override void AddListener()
{
EventManager.Instance.Register(EventManager.EventName.LevelGameWin, Complete);
}
public override void RemoveListener()
{
EventManager.Instance.Unregister(EventManager.EventName.LevelGameWin, Complete);
}
}
internal sealed class EnterStartScene : GuideCompleteBase
{
public EnterStartScene(DataGuide dataGuide, Action completeCallback) : base(dataGuide, completeCallback)
{
}
public override void AddListener()
{
EventManager.Instance.Register(EventManager.EventName.BackToMain, Complete);
}
public override void RemoveListener()
{
EventManager.Instance.Unregister(EventManager.EventName.BackToMain, Complete);
}
} }

View File

@ -1,7 +1,10 @@
using Framework.Constants;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using Framework.Event; using Framework.Event;
using Framework.Manager;
using Framework.UI;
[RequireComponent(typeof(EventPermeate))] [RequireComponent(typeof(EventPermeate))]
public class GuideController : MonoBehaviour public class GuideController : MonoBehaviour
@ -51,23 +54,33 @@ public class GuideController : MonoBehaviour
/// </summary> /// </summary>
private float _yVelocity = 0f; private float _yVelocity = 0f;
private const string BuildCanvas = "BuildUIRoot";
private void Awake() private void Awake()
{ {
EventManager.Instance.Register(EventManager.EventName.GuideMaskStart, ChangeTarget); EventManager.Instance.Register(EventManager.EventName.GuideMaskStart, ChangeTarget);
_material = GetComponent<Image>().material; _material = GetComponent<Image>().material;
_canvas = GameObject.Find("BuildUIRoot").GetComponent<Canvas>();
_imgFinger = transform.Find("Img_Finger").gameObject; _imgFinger = transform.Find("Img_Finger").gameObject;
_textTip = transform.Find("Text_Tip").GetComponent<TMP_Text>(); _textTip = transform.Find("Text_Tip").GetComponent<TMP_Text>();
} }
private void ChangeTarget() private void ChangeTarget()
{ {
_imgFinger.SetActive(false);
_canvas = GameObject.Find(BuildCanvas) != null
? GameObject.Find(BuildCanvas).GetComponent<Canvas>()
: UIRoot.Instance.root.GetComponent<Canvas>();
var targetPath = GuideMananger.Instance.GetGuideMaskTarget(); var targetPath = GuideMananger.Instance.GetGuideMaskTarget();
target = GameObject.Find(targetPath); target = GameObject.Find(targetPath);
if (string.IsNullOrEmpty(targetPath) || target == null) if (string.IsNullOrEmpty(targetPath) || target == null)
{ {
DebugUtil.LogError("target为空:{0}", target == null); target = UIManager.Instance.GetGameObjectUnderWindow(UIConstants.UIWinPanel, targetPath);
return; if (target == null)
{
DebugUtil.LogError("target为空,其路径是:{0}", targetPath);
return;
}
} }
// 设置事件透传对象 // 设置事件透传对象
@ -84,6 +97,8 @@ public class GuideController : MonoBehaviour
{ {
SetMaskForImage(); SetMaskForImage();
} }
SetFingerPos();
} }
private void SetMaskForSpriteRenderer() private void SetMaskForSpriteRenderer()
@ -156,6 +171,31 @@ public class GuideController : MonoBehaviour
return maxDistance; return maxDistance;
} }
private void SetFingerPos()
{
if (_diameter < 100f)
_diameter = 100f;
var center = target.gameObject.transform.position;
var canvasPos = WorldToCanvasPos(_canvas, center);
var newPos = new Vector2(canvasPos.x + _diameter, canvasPos.y - _diameter);
// 获取 Canvas 的 RectTransform
RectTransform canvasRect = _canvas.GetComponent<RectTransform>();
// 计算屏幕边缘的范围
Vector2 minScreenPos = canvasRect.rect.min;
Vector2 maxScreenPos = canvasRect.rect.max;
// 调整 newPos确保不超出屏幕边缘
Vector2 clampedPos = newPos;
clampedPos.x = Mathf.Clamp(clampedPos.x, minScreenPos.x, maxScreenPos.x);
clampedPos.y = Mathf.Clamp(clampedPos.y, minScreenPos.y, maxScreenPos.y);
// 设置 _imgFinger 的 anchoredPosition
_imgFinger.GetComponent<RectTransform>().anchoredPosition = clampedPos;
_imgFinger.SetActive(true);
}
private void Update() private void Update()
{ {
float value = Mathf.SmoothDamp(_current, _diameter, ref _yVelocity, 0.3f); float value = Mathf.SmoothDamp(_current, _diameter, ref _yVelocity, 0.3f);

View File

@ -32,6 +32,7 @@ public class GuideGroup
return guideData.GuideType switch return guideData.GuideType switch
{ {
GuideStepType.Click => new GuideClickStep(guideData), GuideStepType.Click => new GuideClickStep(guideData),
GuideStepType.WinLevel => new WinLevel(guideData),
_ => throw new ArgumentOutOfRangeException($"没有实现{guideData.GuideType}类型的引导方法") _ => throw new ArgumentOutOfRangeException($"没有实现{guideData.GuideType}类型的引导方法")
}; };
} }
@ -55,19 +56,23 @@ public class GuideGroup
DebugUtil.LogG($"{_groupID}组进入{CurGuideStep?.Value.GuideCfg.ID}号引导"); DebugUtil.LogG($"{_groupID}组进入{CurGuideStep?.Value.GuideCfg.ID}号引导");
} }
public void EndGuide()
{
CurGuideStep.Value.EndGuide();
}
/// <summary> /// <summary>
/// 移动至下一个引导 /// 移动至下一个引导
/// </summary> /// </summary>
public void MoveToNextGuide() public void MoveToNextGuide()
{ {
CurGuideStep.Value.EndGuide(); EndGuide();
CurGuideStep = CurGuideStep.Next; CurGuideStep = CurGuideStep.Next;
CurGuideStep?.Value.StartGuide(); CurGuideStep?.Value.StartGuide();
DebugUtil.LogG($"{_groupID}组开启下一个引导 {CurGuideStep?.Value.GuideCfg.ID}"); DebugUtil.LogG($"{_groupID}组开启下一个引导 {CurGuideStep?.Value.GuideCfg.ID}");
} }
public string GetGuideMaskTarget() public string GetGuideMaskTarget()
{ {
return CurGuideStep.Value.GuideCfg.GuideParams; return CurGuideStep.Value.GuideCfg.GuideParams;

View File

@ -3,6 +3,7 @@ using cfg.Guide;
using Framework; using Framework;
using UnityEngine; using UnityEngine;
using Framework.UI; using Framework.UI;
using Gameplay.Manager;
using Framework.Manager; using Framework.Manager;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using System.Collections.Generic; using System.Collections.Generic;
@ -30,14 +31,24 @@ public class GuideMananger : Singlenton<GuideMananger>, IInitable
/// </summary> /// </summary>
private Dictionary<int, LinkedList<DataGuide>> _guideData; private Dictionary<int, LinkedList<DataGuide>> _guideData;
/// <summary>
/// 需要开启新手引导
/// </summary>
public bool NeedGuide; public bool NeedGuide;
/// <summary>
/// 新手引导中
/// </summary>
public bool IsGuiding;
public string PassLevelID;
/// <summary> /// <summary>
/// 获取引导配置 /// 获取引导配置
/// </summary> /// </summary>
public async UniTask InitData() public async UniTask InitData()
{ {
if (!NeedGuide) return; if (!NeedGuide || IsGuiding) return;
var table = TableManager.Instance.Tables.GuideConfig; var table = TableManager.Instance.Tables.GuideConfig;
foreach (var guideData in table.DataList) foreach (var guideData in table.DataList)
{ {
@ -85,9 +96,18 @@ public class GuideMananger : Singlenton<GuideMananger>, IInitable
/// <summary> /// <summary>
/// 开关引导界面 /// 开关引导界面
/// </summary> /// </summary>
public void SetActiveGuideUI(bool active) public void SetActiveGuideUI(bool active, bool destroy = false)
{ {
if (active)
{
var parent = _guideMask.transform.parent;
_guideMask.transform.SetSiblingIndex(parent.parent.childCount - 1);
}
_guideMask.SetActive(active); _guideMask.SetActive(active);
if (!active && destroy)
_guideMask.Destroy();
} }
/// <summary> /// <summary>
@ -139,6 +159,7 @@ public class GuideMananger : Singlenton<GuideMananger>, IInitable
return; return;
if (guideGroup.IsCompleteGroupGuide()) if (guideGroup.IsCompleteGroupGuide())
{ {
guideGroup.EndGuide();
var nextGroup = guideGroup.NextGroupGuideID; var nextGroup = guideGroup.NextGroupGuideID;
if (_guideGroups.TryGetValue(nextGroup, out var group)) if (_guideGroups.TryGetValue(nextGroup, out var group))
{ {
@ -146,9 +167,12 @@ public class GuideMananger : Singlenton<GuideMananger>, IInitable
DebugUtil.LogG($"开启下一组引导:{nextGroup}"); DebugUtil.LogG($"开启下一组引导:{nextGroup}");
} }
DebugUtil.LogError($"完成了所有的引导,并保存了{_curGuideGroup}"); DebugUtil.LogG($"完成了所有的引导,并保存了 {_curGuideGroup} 组引导");
BuildManager.Instance.SetBuildUserInfo(_curGuideGroup); BuildManager.Instance.SetBuildUserInfo(_curGuideGroup);
_curGuideGroup = nextGroup; _curGuideGroup = nextGroup;
IsGuiding = false;
LevelSelectManager.Instance.SaveNewPassLevel(PassLevelID);
SetActiveGuideUI(false, true);
} }
else else
{ {
@ -167,4 +191,12 @@ public class GuideMananger : Singlenton<GuideMananger>, IInitable
{ {
AssetManager.Instance.Unload(Constants.GuideMaskObj); AssetManager.Instance.Unload(Constants.GuideMaskObj);
} }
/// <summary>
/// Debug
/// </summary>
public void RestartGuide()
{
BuildManager.Instance.SetBuildUserInfo(-1);
}
} }

View File

@ -13,7 +13,7 @@ public abstract class GuideStepBase
public readonly DataGuide GuideCfg; public readonly DataGuide GuideCfg;
private GameObject _guiderMask; public bool ShowMask = true;
protected GuideStepBase(DataGuide guideCfg) protected GuideStepBase(DataGuide guideCfg)
{ {
@ -34,6 +34,8 @@ public abstract class GuideStepBase
StepCompleteType.CloseUI => new CloseUI(guideData, CompleteGuide), StepCompleteType.CloseUI => new CloseUI(guideData, CompleteGuide),
StepCompleteType.EnterGame => new EnterGame(guideData, CompleteGuide), StepCompleteType.EnterGame => new EnterGame(guideData, CompleteGuide),
StepCompleteType.ChangeBuild => new ChangeBuild(guideData, CompleteGuide), StepCompleteType.ChangeBuild => new ChangeBuild(guideData, CompleteGuide),
StepCompleteType.FinishGame => new FinishGame(guideData, CompleteGuide),
StepCompleteType.EnterStartScene => new EnterStartScene(guideData, CompleteGuide),
_ => throw new ArgumentOutOfRangeException($"没有实现{guideData.GuideCompleteType}类型的完成方法") _ => throw new ArgumentOutOfRangeException($"没有实现{guideData.GuideCompleteType}类型的完成方法")
}; };
} }
@ -55,10 +57,13 @@ public abstract class GuideStepBase
{ {
//开启该引导相关事件 //开启该引导相关事件
_completeBase.AddListener(); _completeBase.AddListener();
//打开引导界面 if (ShowMask)
GuideMananger.Instance.SetActiveGuideUI(true); {
//发送遮罩镂空更改事件 //打开引导界面
EventManager.Instance.Send(EventManager.EventName.GuideMaskStart); GuideMananger.Instance.SetActiveGuideUI(true);
//发送遮罩镂空更改事件
EventManager.Instance.Send(EventManager.EventName.GuideMaskStart);
}
} }
/// <summary> /// <summary>
@ -74,6 +79,7 @@ public abstract class GuideStepBase
/// </summary> /// </summary>
private void CompleteGuide() private void CompleteGuide()
{ {
DebugUtil.LogG($"{GuideCfg.ID}完成回调");
//移除事件监听 //移除事件监听
_completeBase.RemoveListener(); _completeBase.RemoveListener();
//关闭引导界面 //关闭引导界面
@ -98,4 +104,18 @@ internal sealed class GuideClickStep : GuideStepBase
protected override void SubStartGuide() protected override void SubStartGuide()
{ {
} }
}
internal sealed class WinLevel : GuideStepBase
{
public WinLevel(DataGuide guideCfg) : base(guideCfg)
{
ShowMask = false;
}
protected override void SubStartGuide()
{
GuideMananger.Instance.IsGuiding = true;
}
} }

View File

@ -425,7 +425,7 @@ namespace Framework.Manager
if (_userBuildInfo.ChooseNodeInfo.TryGetValue(node, out var oldOption)) if (_userBuildInfo.ChooseNodeInfo.TryGetValue(node, out var oldOption))
{ {
_userBuildInfo.ChooseNodeInfo[node] = option; _userBuildInfo.ChooseNodeInfo[node] = option;
DebugUtil.LogError("节点{0}保存了{1}选择", node, option); DebugUtil.LogY($"节点{node}保存了{option}选择");
} }
else else
{ {

View File

@ -49,6 +49,16 @@ namespace Framework.UI
{ {
} }
public GameObject GetGameObjectUnderWindow(string path, string objPath)
{
if (_windowsDic.TryGetValue(path, out var window))
{
return window.transform.Find(objPath).gameObject;
}
return null;
}
public async UniTask<UIWindow> OpenWindow(string path, object data = null) public async UniTask<UIWindow> OpenWindow(string path, object data = null)
{ {
var window = await Open(path); var window = await Open(path);

View File

@ -15,6 +15,10 @@ namespace cfg.Guide
/// 点击指定物体 /// 点击指定物体
/// </summary> /// </summary>
Click = 0, Click = 0,
/// <summary>
/// 通关
/// </summary>
WinLevel = 1,
} }
} }

View File

@ -24,9 +24,17 @@ namespace cfg.Guide
/// </summary> /// </summary>
EnterGame = 2, EnterGame = 2,
/// <summary> /// <summary>
/// 结束游戏
/// </summary>
FinishGame = 3,
/// <summary>
/// 更换建造物 /// 更换建造物
/// </summary> /// </summary>
ChangeBuild = 3, ChangeBuild = 4,
/// <summary>
/// 进入主界面
/// </summary>
EnterStartScene = 5,
} }
} }

View File

@ -9,7 +9,6 @@ using PhxhSDK;
public partial class SROptions public partial class SROptions
{ {
[Category("关卡相关"), DisplayName("增加10s")] [Category("关卡相关"), DisplayName("增加10s")]
public void IncreaseTime() public void IncreaseTime()
{ {
@ -40,10 +39,11 @@ public partial class SROptions
LevelSelectManager.Instance.PassAllLevel(); LevelSelectManager.Instance.PassAllLevel();
} }
[Category("关卡相关"), DisplayName("开启新手模式")] [Category("关卡相关"), DisplayName("开启新手引导")]
public void OpenNewGuide() public void OpenNewGuide()
{ {
LevelManager.Instance.IsNewbieGuide = true; LevelManager.Instance.IsNewbieGuide = true;
GuideMananger.Instance.RestartGuide();
} }
[Category("关卡相关"), DisplayName("通关到")] [Category("关卡相关"), DisplayName("通关到")]

View File

@ -63,7 +63,7 @@ namespace Gameplay.LoadingExecutor
} }
//判断是否开启新手引导 //判断是否开启新手引导
if (buildInfo.GuideGroup <= 0) if (!GuideMananger.Instance.IsGuiding && buildInfo.GuideGroup <= 0)
{ {
buildInfo.ChooseNodeInfo = new Dictionary<string, string>(); buildInfo.ChooseNodeInfo = new Dictionary<string, string>();
GuideMananger.Instance.NeedGuide = true; GuideMananger.Instance.NeedGuide = true;
@ -75,7 +75,16 @@ namespace Gameplay.LoadingExecutor
var buildConfig = string.Format(Framework.Constants.Constants.BuildConfigPath, buildId); var buildConfig = string.Format(Framework.Constants.Constants.BuildConfigPath, buildId);
var buildData = await JsonHelper.LoadFromAddressable<BuildData>(buildConfig); var buildData = await JsonHelper.LoadFromAddressable<BuildData>(buildConfig);
var reachCondition = LevelSelectManager.Instance.CurPassLevelIndex; var reachCondition = LevelSelectManager.Instance.CurPassLevelIndex;
BuildManager.Instance.UpdateReachCondition(reachCondition); if (GuideMananger.Instance.IsGuiding && !string.IsNullOrEmpty(GuideMananger.Instance.PassLevelID))
{
var guideCondition = int.Parse(GuideMananger.Instance.PassLevelID.Substring("level".Length));
BuildManager.Instance.UpdateReachCondition(guideCondition);
}
else
{
BuildManager.Instance.UpdateReachCondition(reachCondition);
}
await BuildManager.Instance.Init(buildData, true, buildInfo); await BuildManager.Instance.Init(buildData, true, buildInfo);
await Addressables.LoadSceneAsync(buildPath).ToUniTask(); await Addressables.LoadSceneAsync(buildPath).ToUniTask();
} }
@ -121,6 +130,7 @@ namespace Gameplay.LoadingExecutor
protected override void _OnEnd() protected override void _OnEnd()
{ {
EventManager.Instance.Send(EventManager.EventName.BackToMain);
EventManager.Instance.Send(EventManager.EventName.LoadingEnd); EventManager.Instance.Send(EventManager.EventName.LoadingEnd);
BIManager.Instance.TrackEventOnce(EventFirst.fte_loading_end); BIManager.Instance.TrackEventOnce(EventFirst.fte_loading_end);
} }

View File

@ -59,6 +59,12 @@ namespace Gameplay.Manager
public void SaveNewPassLevel(string levelID) public void SaveNewPassLevel(string levelID)
{ {
if (GuideMananger.Instance.IsGuiding)
{
GuideMananger.Instance.PassLevelID = levelID;
return;
}
var id = int.Parse(levelID.Substring("level".Length)); var id = int.Parse(levelID.Substring("level".Length));
if (CurPassLevelIndex < id) if (CurPassLevelIndex < id)
{ {
@ -72,7 +78,7 @@ namespace Gameplay.Manager
LevelManager.Instance.CanGfxCoin = true; LevelManager.Instance.CanGfxCoin = true;
} }
} }
public void ClearFile() public void ClearFile()
{ {

View File

@ -206,6 +206,7 @@ public class UILevelPanelController : UIWindow
private async void PauseLevel() private async void PauseLevel()
{ {
if (GuideMananger.Instance.IsGuiding) return;
CommonUIUtils.DestroyScreenshot(); CommonUIUtils.DestroyScreenshot();
CommonUIUtils.CaptureScreenshot(); CommonUIUtils.CaptureScreenshot();
LevelManager.Instance.IsPause = true; LevelManager.Instance.IsPause = true;

View File

@ -40,7 +40,10 @@ public class UIStartMainController : UIWindow
FindObj("ResultPanel/Img_Blueprint").GetComponent<Image>().sprite = sprite; FindObj("ResultPanel/Img_Blueprint").GetComponent<Image>().sprite = sprite;
BindButton("ResultPanel/Img_Blueprint/Btn_Close", () => { _blueprint.SetActive(false); }); BindButton("ResultPanel/Img_Blueprint/Btn_Close", () => { _blueprint.SetActive(false); });
} }
/// <summary>
/// 预览
/// </summary>
private void HideAllUI() private void HideAllUI()
{ {
FindObj("UI_LiuHaiBottom").SetActive(false); FindObj("UI_LiuHaiBottom").SetActive(false);
@ -49,6 +52,9 @@ public class UIStartMainController : UIWindow
EventManager.Instance.Send(EventManager.EventName.HideBuildUI); EventManager.Instance.Send(EventManager.EventName.HideBuildUI);
} }
/// <summary>
/// 恢复展示
/// </summary>
private void ShowAllUI() private void ShowAllUI()
{ {
ShowUI(); ShowUI();
@ -68,6 +74,9 @@ public class UIStartMainController : UIWindow
FindObj("UI_LiuHaiTop").SetActive(false); FindObj("UI_LiuHaiTop").SetActive(false);
} }
/// <summary>
/// 查看蓝图
/// </summary>
private void ViewResult() private void ViewResult()
{ {
_blueprint.SetActive(true); _blueprint.SetActive(true);

View File

@ -1,26 +1,26 @@
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/guide_guideconfig.json,29B264A23BA8CD2749AD2EC3B7B39D47,2024,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/guide_guideconfig.json,1B942B12FE474D85AEF5EEA69A52434,2523,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,7478C1A5F9A0908094F9D896FF2FF8,8311,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,343DBBC697FCB77685E7338FC24EA1DA,8511,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/DataGuide.cs,A23BB4F3F93B395441BB83D74E59B6F,4292,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/DataGuide.cs,A23BB4F3F93B395441BB83D74E59B6F,4292,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideConfig.cs,B1779443C4E6B0FD80A8B0CAE418015,2003,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideConfig.cs,B1779443C4E6B0FD80A8B0CAE418015,2003,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideStepType.cs,50DE437238924E2724E493BD449A536,520,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideStepType.cs,BEB85D16C8FEBFBE0679C7F9C9F9A8,606,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/StepCompleteType.cs,2A047A7CCF76D2AE6F4AA9F89224B13,812,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/StepCompleteType.cs,C360B48BE0179D52C15D41892A4B,1008,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1721886650787 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1721894399796
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,16F3D2F3A20B0D35793F8A5A8194E59,2303,1721886650786 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,16F3D2F3A20B0D35793F8A5A8194E59,2303,1721894399793
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,07D177582EBF7BC5445490E245C996,12604,1721886644427 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,BB1B7B4C814680E15D54B12E0C4BAD5,12703,1721893666572
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,CA2D48B6B6FAC5A9F046ACE375EA6A5B,11099,1721709912370 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,CA2D48B6B6FAC5A9F046ACE375EA6A5B,11099,1721709912370
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,D49DD4C2226B1AED21398727B2144A9,9832,1721801067448 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,D49DD4C2226B1AED21398727B2144A9,9832,1721801067448
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Guide.xlsx,C77CE4FBC272D9B8A7F394159464482,10287,1721886642046 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Guide.xlsx,6D35E0C2CC6D8396CB1A676530EAD2,10493,1721894375600
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,DF7478D165C035173F51B0BFD0CEA660,13423,1721709916112 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,F82F5C747CBB6CE963F76A2625312A,13521,1721893669630

Binary file not shown.

Binary file not shown.

Binary file not shown.