diff --git a/Assets/Resources/Config/GameConfig.asset b/Assets/Resources/Config/GameConfig.asset index c714eacc..f981794e 100644 --- a/Assets/Resources/Config/GameConfig.asset +++ b/Assets/Resources/Config/GameConfig.asset @@ -77,18 +77,6 @@ MonoBehaviour: GroupNum: 1 MaxHp: 3704 Damage: 1852 - - CardID: Human_08 - GroupNum: 1 - MaxHp: 4856 - Damage: 2324 - - CardID: Human_09 - GroupNum: 1 - MaxHp: 11652 - Damage: 5576 - - CardID: Human_10 - GroupNum: 1 - MaxHp: 27964 - Damage: 13380 - CardID: Monster_01 GroupNum: 4 MaxHp: 52 @@ -117,15 +105,3 @@ MonoBehaviour: GroupNum: 1 MaxHp: 9956 Damage: 1464 - - CardID: Monster_08 - GroupNum: 1 - MaxHp: 16344 - Damage: 1814 - - CardID: Monster_09 - GroupNum: 1 - MaxHp: 39226 - Damage: 4354 - - CardID: Monster_10 - GroupNum: 1 - MaxHp: 94142 - Damage: 10450 diff --git a/Assets/Resources/Config/LanguageConfig.asset b/Assets/Resources/Config/LanguageConfig.asset index d77de1b3..74ab6e76 100644 --- a/Assets/Resources/Config/LanguageConfig.asset +++ b/Assets/Resources/Config/LanguageConfig.asset @@ -51,19 +51,19 @@ MonoBehaviour: - Key: Human LangStrs: - LangType: 0 - LString: "\u4EBA\u7C7B" + LString: "\u8FDC\u7A0B" - LangType: 1 - LString: Human + LString: Far - LangType: 2 - LString: Human + LString: Far - Key: Monster LangStrs: - LangType: 0 - LString: "\u602A\u517D" + LString: "\u8FD1\u6218" - LangType: 1 - LString: Monster + LString: Near - LangType: 2 - LString: Monster + LString: Near - Key: NewCard LangStrs: - LangType: 0 @@ -123,59 +123,59 @@ MonoBehaviour: - Key: Human_01 LangStrs: - LangType: 0 - LString: "\u730E\u624B" + LString: "\u5C04\u624B" - LangType: 1 - LString: Hunter + LString: Marksmen - LangType: 2 - LString: Hunter + LString: Marksmen - Key: Human_02 LangStrs: - LangType: 0 - LString: "\u5F13\u5175" + LString: "\u72D9\u795E" - LangType: 1 - LString: Archer + LString: McMillan - LangType: 2 - LString: Archer + LString: McMillan - Key: Human_03 LangStrs: - LangType: 0 - LString: "\u6218\u58EB" + LString: "\u8FEB\u51FB\u70AE" - LangType: 1 - LString: Soldier + LString: 80s - LangType: 2 - LString: Soldier + LString: 80s - Key: Human_04 LangStrs: - LangType: 0 - LString: "\u89D2\u6597\u58EB" + LString: "\u52A0\u519C\u70AE" - LangType: 1 - LString: Gladiator + LString: Cannon - LangType: 2 - LString: Gladiator + LString: Cannon - Key: Human_05 LangStrs: - LangType: 0 - LString: "\u634D\u536B\u8005" + LString: "\u201C\u8001\u5175\u201D" - LangType: 1 - LString: Champion + LString: Veteran - LangType: 2 - LString: Champion + LString: Veteran - Key: Human_06 LangStrs: - LangType: 0 - LString: "\u5DEB\u5E08" + LString: "\u201D\u963F\u6CE2\u7F57\u201C" - LangType: 1 - LString: Wizard + LString: Apolo - LangType: 2 - LString: Wizard + LString: Apolo - Key: Human_07 LangStrs: - LangType: 0 - LString: "\u5927\u6CD5\u5E08" + LString: S76 - LangType: 1 - LString: Warloch + LString: S76 - LangType: 2 - LString: Warloch + LString: S76 - Key: Human_08 LangStrs: - LangType: 0 @@ -203,59 +203,59 @@ MonoBehaviour: - Key: Monster_01 LangStrs: - LangType: 0 - LString: "\u5C0F\u77F3\u5934" + LString: "\u65B0\u5175" - LangType: 1 - LString: Geodude + LString: Rookie - LangType: 2 - LString: Geodude + LString: Rookie - Key: Monster_02 LangStrs: - LangType: 0 - LString: "\u8C7A\u72FC" + LString: "\u7CBE\u82F1\u5C0F\u961F" - LangType: 1 - LString: Jackalein + LString: Elite Squad - LangType: 2 - LString: Jackalein + LString: Elite Squad - Key: Monster_03 LangStrs: - LangType: 0 - LString: "\u5C0F\u5C0F" + LString: "\u5175\u738B" - LangType: 1 - LString: Atlas + LString: Rambo - LangType: 2 - LString: Atlas + LString: Rambo - Key: Monster_04 LangStrs: - LangType: 0 - LString: "\u672B\u5F71\u87D2" + LString: "\u4E8C\u6218\u96C4\u72EE" - LangType: 1 - LString: Serpantrion + LString: Tiger - LangType: 2 - LString: Serpantrion + LString: Tiger - Key: Monster_05 LangStrs: - LangType: 0 - LString: "\u62B1\u62B1\u602A" + LString: "\u73B0\u4EE3\u5766\u514B" - LangType: 1 - LString: Huggy Wuggy + LString: Arabama - LangType: 2 - LString: Huggy Wuggy + LString: Arabama - Key: Monster_06 LangStrs: - LangType: 0 - LString: "\u4EB2\u4EB2\u602A" + LString: "\u874E\u5F0F" - LangType: 1 - LString: Kissy Missy + LString: Scorpion - LangType: 2 - LString: Kissy Missy + LString: Scorpion - Key: Monster_07 LangStrs: - LangType: 0 - LString: "\u8B66\u7B1B\u5934" + LString: D117 - LangType: 1 - LString: Siren Head + LString: D117 - LangType: 2 - LString: Siren Head + LString: D117 - Key: Monster_08 LangStrs: - LangType: 0 diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_03.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_03.prefab index beb56d11..5b4e7cd3 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_03.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_03.prefab @@ -1,35 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1965351594296061286 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6125202403297535494} - m_Layer: 0 - m_Name: AtkTrans - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6125202403297535494 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1965351594296061286} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0003, y: 0.0056, z: 0.8166} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4936125323695638278} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2480560915592131373 GameObject: m_ObjectHideFlags: 0 @@ -121,7 +91,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2501806523831773119} + - {fileID: 662715889989886310} - {fileID: 593100444078087247} - {fileID: 5261491334074807132} m_Father: {fileID: 0} @@ -285,166 +255,135 @@ Transform: m_Father: {fileID: 3417902723635480446} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2997452674192252177 +--- !u!1001 &3642740805639932457 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3417902723635480446} m_Modifications: - - target: {fileID: 748568115233572122, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 3494007774103450992, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4250328647684124829, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: db3e4756a91e941b484f958b1b4cba0e, type: 2} - - target: {fileID: 748568115233572122, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4250328647684124829, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_ApplyRootMotion value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4298918519627355549, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4299364676394851791, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4299763703857436981, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4299810268986407383, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4300247633180340307, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4300277115275328627, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, + type: 3} + propertyPath: m_Name + value: LR-1 + objectReference: {fileID: 0} + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalScale.x value: 1.3 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalScale.y value: 1.3 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalScale.z value: 1.3 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalPosition.x value: -0.6 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + - target: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 806862769481278624, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 806936600367543644, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 807281908383957658, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 807393967206432254, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_Name - value: LR-2 - objectReference: {fileID: 0} - - target: {fileID: 807722466217275478, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 807790614270536632, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 808165890746551628, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 808329246307106472, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 808329869588978170, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 808338394882208850, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 808395026293588792, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7859921525115000391, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6f09509dfffb76a42aad8f957956569d, type: 3} ---- !u!4 &2501806523831773119 stripped + m_SourcePrefab: {fileID: 100100000, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} +--- !u!4 &662715889989886310 stripped Transform: - m_CorrespondingSourceObject: {fileID: 801962427963505326, guid: 6f09509dfffb76a42aad8f957956569d, + m_CorrespondingSourceObject: {fileID: 4305421320640244559, guid: 1c78dd0817211fe4c99c2c9ef17d0cb1, type: 3} - m_PrefabInstance: {fileID: 2997452674192252177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4936125323695638278 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7861513117303724567, guid: 6f09509dfffb76a42aad8f957956569d, - type: 3} - m_PrefabInstance: {fileID: 2997452674192252177} + m_PrefabInstance: {fileID: 3642740805639932457} m_PrefabAsset: {fileID: 0} --- !u!1001 &4672327334800049723 PrefabInstance: diff --git a/Assets/Resources/UI/Icon/Human_01.png b/Assets/Resources/UI/Icon/Human_01.png index 2c7cb038..f1707da7 100644 Binary files a/Assets/Resources/UI/Icon/Human_01.png and b/Assets/Resources/UI/Icon/Human_01.png differ diff --git a/Assets/Resources/UI/Icon/Human_02.png b/Assets/Resources/UI/Icon/Human_02.png index 365c853d..2ee6010b 100644 Binary files a/Assets/Resources/UI/Icon/Human_02.png and b/Assets/Resources/UI/Icon/Human_02.png differ diff --git a/Assets/Resources/UI/Icon/Human_03.png b/Assets/Resources/UI/Icon/Human_03.png index 359b4585..5d3e7cbe 100644 Binary files a/Assets/Resources/UI/Icon/Human_03.png and b/Assets/Resources/UI/Icon/Human_03.png differ diff --git a/Assets/Resources/UI/Icon/Human_04.png b/Assets/Resources/UI/Icon/Human_04.png index a80b7ac7..a5769c7a 100644 Binary files a/Assets/Resources/UI/Icon/Human_04.png and b/Assets/Resources/UI/Icon/Human_04.png differ diff --git a/Assets/Resources/UI/Icon/Human_05.png b/Assets/Resources/UI/Icon/Human_05.png index 1a802637..cc410b93 100644 Binary files a/Assets/Resources/UI/Icon/Human_05.png and b/Assets/Resources/UI/Icon/Human_05.png differ diff --git a/Assets/Resources/UI/Icon/Human_06.png b/Assets/Resources/UI/Icon/Human_06.png index b0c3fc09..a3d12358 100644 Binary files a/Assets/Resources/UI/Icon/Human_06.png and b/Assets/Resources/UI/Icon/Human_06.png differ diff --git a/Assets/Resources/UI/Icon/Human_07.png b/Assets/Resources/UI/Icon/Human_07.png index a8995332..a7198145 100644 Binary files a/Assets/Resources/UI/Icon/Human_07.png and b/Assets/Resources/UI/Icon/Human_07.png differ diff --git a/Assets/Resources/UI/Icon/Monster_01.png b/Assets/Resources/UI/Icon/Monster_01.png index 9dbdcb69..88a8d7cd 100644 Binary files a/Assets/Resources/UI/Icon/Monster_01.png and b/Assets/Resources/UI/Icon/Monster_01.png differ diff --git a/Assets/Resources/UI/Icon/Monster_02.png b/Assets/Resources/UI/Icon/Monster_02.png index 7b0da50c..58727a01 100644 Binary files a/Assets/Resources/UI/Icon/Monster_02.png and b/Assets/Resources/UI/Icon/Monster_02.png differ diff --git a/Assets/Resources/UI/Icon/Monster_03.png b/Assets/Resources/UI/Icon/Monster_03.png index 50beeaa0..eda79e2a 100644 Binary files a/Assets/Resources/UI/Icon/Monster_03.png and b/Assets/Resources/UI/Icon/Monster_03.png differ diff --git a/Assets/Resources/UI/Icon/Monster_04.png b/Assets/Resources/UI/Icon/Monster_04.png index 17546473..5f8d62cd 100644 Binary files a/Assets/Resources/UI/Icon/Monster_04.png and b/Assets/Resources/UI/Icon/Monster_04.png differ diff --git a/Assets/Resources/UI/Icon/Monster_05.png b/Assets/Resources/UI/Icon/Monster_05.png index 76b0ff38..2d9de350 100644 Binary files a/Assets/Resources/UI/Icon/Monster_05.png and b/Assets/Resources/UI/Icon/Monster_05.png differ diff --git a/Assets/Resources/UI/Icon/Monster_06.png b/Assets/Resources/UI/Icon/Monster_06.png index 442863c5..46eee360 100644 Binary files a/Assets/Resources/UI/Icon/Monster_06.png and b/Assets/Resources/UI/Icon/Monster_06.png differ diff --git a/Assets/Resources/UI/Icon/Monster_07.png b/Assets/Resources/UI/Icon/Monster_07.png index a3902ae6..a0e0d5b1 100644 Binary files a/Assets/Resources/UI/Icon/Monster_07.png and b/Assets/Resources/UI/Icon/Monster_07.png differ diff --git a/Assets/Resources/UI/Image/buff_jackpot.png b/Assets/Resources/UI/Image/buff_jackpot.png index 80265d94..509a4486 100644 Binary files a/Assets/Resources/UI/Image/buff_jackpot.png and b/Assets/Resources/UI/Image/buff_jackpot.png differ diff --git a/Assets/Resources/UI/Image/game-butbt.png b/Assets/Resources/UI/Image/game-butbt.png index 165f5f76..5251e451 100644 Binary files a/Assets/Resources/UI/Image/game-butbt.png and b/Assets/Resources/UI/Image/game-butbt.png differ diff --git a/Assets/Resources/UI/Image/glow4.png b/Assets/Resources/UI/Image/glow4.png index a82a86be..c6c97a4d 100644 Binary files a/Assets/Resources/UI/Image/glow4.png and b/Assets/Resources/UI/Image/glow4.png differ diff --git a/Assets/Resources/UI/Image/icon-far.png b/Assets/Resources/UI/Image/icon-far.png index 03f00e81..4a371edf 100644 Binary files a/Assets/Resources/UI/Image/icon-far.png and b/Assets/Resources/UI/Image/icon-far.png differ diff --git a/Assets/Resources/UI/Image/icon-near.png b/Assets/Resources/UI/Image/icon-near.png index 76bad3a2..571fbf0d 100644 Binary files a/Assets/Resources/UI/Image/icon-near.png and b/Assets/Resources/UI/Image/icon-near.png differ diff --git a/Assets/Resources/UI/Image/main_buff.png b/Assets/Resources/UI/Image/main_buff.png new file mode 100644 index 00000000..b6d9e059 Binary files /dev/null and b/Assets/Resources/UI/Image/main_buff.png differ diff --git a/Assets/Resources/UI/Image/main_buff.png.meta b/Assets/Resources/UI/Image/main_buff.png.meta new file mode 100644 index 00000000..3cb2a3a6 --- /dev/null +++ b/Assets/Resources/UI/Image/main_buff.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6c496f3f0473946c28f7614f3e9a4897 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Image/main_gold.png b/Assets/Resources/UI/Image/main_gold.png index 57ed93e1..08de4004 100644 Binary files a/Assets/Resources/UI/Image/main_gold.png and b/Assets/Resources/UI/Image/main_gold.png differ diff --git a/Assets/Resources/UI/Image/main_level_bar1.png b/Assets/Resources/UI/Image/main_level_bar1.png index 9f20451f..4eabf1df 100644 Binary files a/Assets/Resources/UI/Image/main_level_bar1.png and b/Assets/Resources/UI/Image/main_level_bar1.png differ diff --git a/Assets/Resources/UI/Image/main_level_bar1_1.png b/Assets/Resources/UI/Image/main_level_bar1_1.png index bb440ffb..b8052815 100644 Binary files a/Assets/Resources/UI/Image/main_level_bar1_1.png and b/Assets/Resources/UI/Image/main_level_bar1_1.png differ diff --git a/Assets/Resources/UI/Image/main_level_bar1_2.png b/Assets/Resources/UI/Image/main_level_bar1_2.png index e041a086..a2803293 100644 Binary files a/Assets/Resources/UI/Image/main_level_bar1_2.png and b/Assets/Resources/UI/Image/main_level_bar1_2.png differ diff --git a/Assets/Resources/UI/Image/main_level_bar2.png b/Assets/Resources/UI/Image/main_level_bar2.png index 7a61237f..aa9e6e66 100644 Binary files a/Assets/Resources/UI/Image/main_level_bar2.png and b/Assets/Resources/UI/Image/main_level_bar2.png differ diff --git a/Assets/Resources/UI/Image/main_level_bar2_1.png b/Assets/Resources/UI/Image/main_level_bar2_1.png index 32da8358..e9c906ec 100644 Binary files a/Assets/Resources/UI/Image/main_level_bar2_1.png and b/Assets/Resources/UI/Image/main_level_bar2_1.png differ diff --git a/Assets/Resources/UI/Image/main_level_bar2_2.png b/Assets/Resources/UI/Image/main_level_bar2_2.png index 092cae9e..5d1706af 100644 Binary files a/Assets/Resources/UI/Image/main_level_bar2_2.png and b/Assets/Resources/UI/Image/main_level_bar2_2.png differ diff --git a/Assets/Resources/UI/Image/main_level_bottomborder.png b/Assets/Resources/UI/Image/main_level_bottomborder.png index 6c9f9775..b0a88827 100644 Binary files a/Assets/Resources/UI/Image/main_level_bottomborder.png and b/Assets/Resources/UI/Image/main_level_bottomborder.png differ diff --git a/Assets/Resources/UI/Image/main_noads_icon.png b/Assets/Resources/UI/Image/main_noads_icon.png index dfe3b9bf..456c0c82 100644 Binary files a/Assets/Resources/UI/Image/main_noads_icon.png and b/Assets/Resources/UI/Image/main_noads_icon.png differ diff --git a/Assets/Resources/UI/Image/main_select_box.png b/Assets/Resources/UI/Image/main_select_box.png index 4f0ad703..a60665c7 100644 Binary files a/Assets/Resources/UI/Image/main_select_box.png and b/Assets/Resources/UI/Image/main_select_box.png differ diff --git a/Assets/Resources/UI/Image/main_setting.png b/Assets/Resources/UI/Image/main_setting.png index 765f5a40..4f4df382 100644 Binary files a/Assets/Resources/UI/Image/main_setting.png and b/Assets/Resources/UI/Image/main_setting.png differ diff --git a/Assets/Resources/UI/Image/main_tujian_icon.png b/Assets/Resources/UI/Image/main_tujian_icon.png index 4f38eee4..348f51be 100644 Binary files a/Assets/Resources/UI/Image/main_tujian_icon.png and b/Assets/Resources/UI/Image/main_tujian_icon.png differ diff --git a/Assets/Resources/UI/Image/main_war.png b/Assets/Resources/UI/Image/main_war.png index c4f9042b..c283553f 100644 Binary files a/Assets/Resources/UI/Image/main_war.png and b/Assets/Resources/UI/Image/main_war.png differ diff --git a/Assets/Resources/UI/Image/no_ads_nothanks.png b/Assets/Resources/UI/Image/no_ads_nothanks.png index 0c210edf..1dec55b8 100644 Binary files a/Assets/Resources/UI/Image/no_ads_nothanks.png and b/Assets/Resources/UI/Image/no_ads_nothanks.png differ diff --git a/Assets/Resources/UI/Image/noads_background.png b/Assets/Resources/UI/Image/noads_background.png index 674dce0a..d3b93390 100644 Binary files a/Assets/Resources/UI/Image/noads_background.png and b/Assets/Resources/UI/Image/noads_background.png differ diff --git a/Assets/Resources/UI/Image/noads_redbar.png b/Assets/Resources/UI/Image/noads_redbar.png index f8f89843..f0927859 100644 Binary files a/Assets/Resources/UI/Image/noads_redbar.png and b/Assets/Resources/UI/Image/noads_redbar.png differ diff --git a/Assets/Resources/UI/Image/noads_select_box.png b/Assets/Resources/UI/Image/noads_select_box.png index c6ad0268..7d46f8f6 100644 Binary files a/Assets/Resources/UI/Image/noads_select_box.png and b/Assets/Resources/UI/Image/noads_select_box.png differ diff --git a/Assets/Resources/UI/Image/noads_tu.png b/Assets/Resources/UI/Image/noads_tu.png index 2425b092..739b6129 100644 Binary files a/Assets/Resources/UI/Image/noads_tu.png and b/Assets/Resources/UI/Image/noads_tu.png differ diff --git a/Assets/Resources/UI/Image/setting-pp.png b/Assets/Resources/UI/Image/setting-pp.png index 0e2d6606..2321ac8f 100644 Binary files a/Assets/Resources/UI/Image/setting-pp.png and b/Assets/Resources/UI/Image/setting-pp.png differ diff --git a/Assets/Resources/UI/Image/setting-shake.png b/Assets/Resources/UI/Image/setting-shake.png index c4de59ab..68184182 100644 Binary files a/Assets/Resources/UI/Image/setting-shake.png and b/Assets/Resources/UI/Image/setting-shake.png differ diff --git a/Assets/Resources/UI/Image/setting-switch bar1.png b/Assets/Resources/UI/Image/setting-switch bar1.png index c1425eb2..b6ff9901 100644 Binary files a/Assets/Resources/UI/Image/setting-switch bar1.png and b/Assets/Resources/UI/Image/setting-switch bar1.png differ diff --git a/Assets/Resources/UI/Image/setting-switch bar2.png b/Assets/Resources/UI/Image/setting-switch bar2.png index 2a5625cd..58d9b5cb 100644 Binary files a/Assets/Resources/UI/Image/setting-switch bar2.png and b/Assets/Resources/UI/Image/setting-switch bar2.png differ diff --git a/Assets/Resources/UI/Image/setting-tos.png b/Assets/Resources/UI/Image/setting-tos.png index e92bdf12..39d43e16 100644 Binary files a/Assets/Resources/UI/Image/setting-tos.png and b/Assets/Resources/UI/Image/setting-tos.png differ diff --git a/Assets/Resources/UI/Image/setting-voice.png b/Assets/Resources/UI/Image/setting-voice.png index 7cb92f02..c7036173 100644 Binary files a/Assets/Resources/UI/Image/setting-voice.png and b/Assets/Resources/UI/Image/setting-voice.png differ diff --git a/Assets/Resources/UI/Image/setting_bottom_border.png b/Assets/Resources/UI/Image/setting_bottom_border.png index a50d9cfe..e7ba0897 100644 Binary files a/Assets/Resources/UI/Image/setting_bottom_border.png and b/Assets/Resources/UI/Image/setting_bottom_border.png differ diff --git a/Assets/Resources/UI/Image/setting_bottom_choose1.png b/Assets/Resources/UI/Image/setting_bottom_choose1.png index 9cdeccf5..a63eaa06 100644 Binary files a/Assets/Resources/UI/Image/setting_bottom_choose1.png and b/Assets/Resources/UI/Image/setting_bottom_choose1.png differ diff --git a/Assets/Resources/UI/Image/setting_bottom_choose2.png b/Assets/Resources/UI/Image/setting_bottom_choose2.png index 719c50ca..38a004c7 100644 Binary files a/Assets/Resources/UI/Image/setting_bottom_choose2.png and b/Assets/Resources/UI/Image/setting_bottom_choose2.png differ diff --git a/Assets/Resources/UI/Image/setting_circle.png b/Assets/Resources/UI/Image/setting_circle.png index a2f52f4d..15d14d18 100644 Binary files a/Assets/Resources/UI/Image/setting_circle.png and b/Assets/Resources/UI/Image/setting_circle.png differ diff --git a/Assets/Resources/UI/Image/setting_restore.png b/Assets/Resources/UI/Image/setting_restore.png index 8458b107..810f90b0 100644 Binary files a/Assets/Resources/UI/Image/setting_restore.png and b/Assets/Resources/UI/Image/setting_restore.png differ diff --git a/Assets/Resources/UI/Image/setting_turnoff.png b/Assets/Resources/UI/Image/setting_turnoff.png index 86dcaf92..64b7e1c5 100644 Binary files a/Assets/Resources/UI/Image/setting_turnoff.png and b/Assets/Resources/UI/Image/setting_turnoff.png differ diff --git a/Assets/Resources/UI/Image/settlement_jackpot_gold.png b/Assets/Resources/UI/Image/settlement_jackpot_gold.png index ab29120d..aaadba71 100644 Binary files a/Assets/Resources/UI/Image/settlement_jackpot_gold.png and b/Assets/Resources/UI/Image/settlement_jackpot_gold.png differ diff --git a/Assets/Resources/UI/Image/settlement_wave_cfail.png b/Assets/Resources/UI/Image/settlement_wave_cfail.png index 6e6f9180..873ec1ad 100644 Binary files a/Assets/Resources/UI/Image/settlement_wave_cfail.png and b/Assets/Resources/UI/Image/settlement_wave_cfail.png differ diff --git a/Assets/Resources/UI/Image/settlement_wave_clear.png b/Assets/Resources/UI/Image/settlement_wave_clear.png index e86274ea..605ed053 100644 Binary files a/Assets/Resources/UI/Image/settlement_wave_clear.png and b/Assets/Resources/UI/Image/settlement_wave_clear.png differ diff --git a/Assets/Resources/UI/Image/tujian_bar.png b/Assets/Resources/UI/Image/tujian_bar.png index 2ce7afb3..0c88c68a 100644 Binary files a/Assets/Resources/UI/Image/tujian_bar.png and b/Assets/Resources/UI/Image/tujian_bar.png differ diff --git a/Assets/Resources/UI/Image/tujian_bottom_border.png b/Assets/Resources/UI/Image/tujian_bottom_border.png index a0b863d0..57b4972e 100644 Binary files a/Assets/Resources/UI/Image/tujian_bottom_border.png and b/Assets/Resources/UI/Image/tujian_bottom_border.png differ diff --git a/Assets/Resources/UI/Image/tujian_icon_monster.png b/Assets/Resources/UI/Image/tujian_icon_monster.png index 8a66ff02..6461fcb8 100644 Binary files a/Assets/Resources/UI/Image/tujian_icon_monster.png and b/Assets/Resources/UI/Image/tujian_icon_monster.png differ diff --git a/Assets/Resources/UI/Image/tujian_icon_people.png b/Assets/Resources/UI/Image/tujian_icon_people.png index ea1d3def..e6000e4b 100644 Binary files a/Assets/Resources/UI/Image/tujian_icon_people.png and b/Assets/Resources/UI/Image/tujian_icon_people.png differ diff --git a/Assets/Resources/UI/Image/tujian_select_bb.png b/Assets/Resources/UI/Image/tujian_select_bb.png index 74076d53..5e3b2e84 100644 Binary files a/Assets/Resources/UI/Image/tujian_select_bb.png and b/Assets/Resources/UI/Image/tujian_select_bb.png differ diff --git a/Assets/Resources/UI/Image/tujian_select_box.png b/Assets/Resources/UI/Image/tujian_select_box.png index 6ee93ff5..13852f86 100644 Binary files a/Assets/Resources/UI/Image/tujian_select_box.png and b/Assets/Resources/UI/Image/tujian_select_box.png differ diff --git a/Assets/Resources/UI/Image/tujian_select_mask.png b/Assets/Resources/UI/Image/tujian_select_mask.png index a5398b68..a0ca1e54 100644 Binary files a/Assets/Resources/UI/Image/tujian_select_mask.png and b/Assets/Resources/UI/Image/tujian_select_mask.png differ diff --git a/Assets/Resources/UI/Image/tujian_select_sword.png b/Assets/Resources/UI/Image/tujian_select_sword.png index 22e12799..41632496 100644 Binary files a/Assets/Resources/UI/Image/tujian_select_sword.png and b/Assets/Resources/UI/Image/tujian_select_sword.png differ diff --git a/Assets/Resources/UI/Panel/PanelBook.prefab b/Assets/Resources/UI/Panel/PanelBook.prefab index c5aa9716..7a44abde 100644 --- a/Assets/Resources/UI/Panel/PanelBook.prefab +++ b/Assets/Resources/UI/Panel/PanelBook.prefab @@ -4393,7 +4393,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 18, y: 20} + m_AnchoredPosition: {x: -7, y: 20.000061} m_SizeDelta: {x: 30, y: 18} m_Pivot: {x: 1, y: 1} --- !u!222 &1062115953812059671 @@ -4476,7 +4476,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1062115954846403414} m_Direction: 2 m_Value: 1 - m_Size: 0.4659091 + m_Size: 0.65957445 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4993,11 +4993,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1062115954531093802} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -20, y: 510} + m_AnchoredPosition: {x: -20, y: 555} m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1062115954315262381 @@ -5089,7 +5089,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -5, y: 33} - m_SizeDelta: {x: 52, y: 69} + m_SizeDelta: {x: 97, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1062115954339296202 CanvasRenderer: @@ -5163,7 +5163,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -5, y: 33} - m_SizeDelta: {x: 59, y: 59} + m_SizeDelta: {x: 95, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1062115954339565517 CanvasRenderer: @@ -5287,8 +5287,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1062115954531093802} - - component: {fileID: 1062115954531093780} - - component: {fileID: 1062115954531093803} m_Layer: 5 m_Name: Bg m_TagString: Untagged @@ -5307,8 +5305,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1062115954315262370} - {fileID: 619359127892437979} + - {fileID: 2701868813410682586} + - {fileID: 1062115954315262370} - {fileID: 1062115955037011226} - {fileID: 3716605574722114678} - {fileID: 216152002735400790} @@ -5318,45 +5317,8 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 60, y: 0} - m_SizeDelta: {x: 794, y: 1191} + m_SizeDelta: {x: 867, y: 1261} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1062115954531093780 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062115954531093801} - m_CullTransparentMesh: 0 ---- !u!114 &1062115954531093803 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062115954531093801} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 96e8b46907aa64f05a0bab2cfcfdda3c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1062115954770748266 GameObject: m_ObjectHideFlags: 0 @@ -6151,12 +6113,12 @@ RectTransform: - {fileID: 1062115954309495066} - {fileID: 1062115953812059668} m_Father: {fileID: 1062115954531093802} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -15, y: -12} - m_SizeDelta: {x: 750, y: 820} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 750, y: 930} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1062115955037011205 CanvasRenderer: @@ -6338,10 +6300,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1817832676 MonoBehaviour: @@ -6578,7 +6540,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -390, y: 250} + m_AnchoredPosition: {x: -435, y: 250} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1062115955173807009 @@ -6906,12 +6868,12 @@ RectTransform: - {fileID: 3561925252750682913} - {fileID: 6138568924360698853} m_Father: {fileID: 1062115954531093802} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -15, y: -12} - m_SizeDelta: {x: 750, y: 820} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 750, y: 930} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9120543392168905738 CanvasRenderer: @@ -7074,7 +7036,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2961805515600181331 RectTransform: m_ObjectHideFlags: 0 @@ -7090,10 +7052,10 @@ RectTransform: m_Father: {fileID: 4298858863195123165} m_RootOrder: 9 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: 536.5, y: -1585} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1617000556964588029 MonoBehaviour: @@ -9187,12 +9149,12 @@ RectTransform: - {fileID: 5110718257854201774} - {fileID: 8745644498179445333} m_Father: {fileID: 1062115954531093802} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -15, y: -12} - m_SizeDelta: {x: 750, y: 820} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 750, y: 930} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9219637731816322137 CanvasRenderer: @@ -12558,7 +12520,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 18, y: 20} + m_AnchoredPosition: {x: -7, y: 20} m_SizeDelta: {x: 30, y: 18} m_Pivot: {x: 1, y: 1} --- !u!222 &1857916275897553129 @@ -14403,7 +14365,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2579841837796578324 RectTransform: m_ObjectHideFlags: 0 @@ -14419,10 +14381,10 @@ RectTransform: m_Father: {fileID: 4298858863195123165} m_RootOrder: 7 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: 536.5, y: -1235} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3981594718192807038 MonoBehaviour: @@ -17410,7 +17372,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1978009248506725388 RectTransform: m_ObjectHideFlags: 0 @@ -17426,10 +17388,10 @@ RectTransform: m_Father: {fileID: 1062115955254514257} m_RootOrder: 8 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: 186.5, y: -1585} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8577503496997527030 MonoBehaviour: @@ -21370,6 +21332,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5742518297381386809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2701868813410682586} + - component: {fileID: 2761121850633209776} + - component: {fileID: 7104730747291841127} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2701868813410682586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5742518297381386809} + 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_Children: [] + m_Father: {fileID: 1062115954531093802} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 867, y: 1261} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2761121850633209776 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5742518297381386809} + m_CullTransparentMesh: 0 +--- !u!114 &7104730747291841127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5742518297381386809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 96e8b46907aa64f05a0bab2cfcfdda3c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5795590322894563613 GameObject: m_ObjectHideFlags: 0 @@ -21441,7 +21477,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9005560578837593300 RectTransform: m_ObjectHideFlags: 0 @@ -21457,10 +21493,10 @@ RectTransform: m_Father: {fileID: 1062115955254514257} m_RootOrder: 7 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: 536.5, y: -1235} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6492508692365728627 MonoBehaviour: @@ -23381,7 +23417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6885845573931259995 RectTransform: m_ObjectHideFlags: 0 @@ -23397,10 +23433,10 @@ RectTransform: m_Father: {fileID: 1062115955254514257} m_RootOrder: 9 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: 536.5, y: -1585} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2370154026282383722 MonoBehaviour: @@ -26988,7 +27024,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 18, y: 20} + m_AnchoredPosition: {x: -7, y: 20} m_SizeDelta: {x: 30, y: 18} m_Pivot: {x: 1, y: 1} --- !u!222 &9220282370085433704 @@ -27071,7 +27107,7 @@ MonoBehaviour: m_HandleRect: {fileID: 8265343813714484876} m_Direction: 2 m_Value: 1 - m_Size: 0.4659091 + m_Size: 0.52840906 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -28150,7 +28186,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5776038874750826338 RectTransform: m_ObjectHideFlags: 0 @@ -28166,10 +28202,10 @@ RectTransform: m_Father: {fileID: 4298858863195123165} m_RootOrder: 8 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: 186.5, y: -1585} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4009605944988585516 MonoBehaviour: @@ -30744,12 +30780,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1062115954531093802} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -85, y: -95} - m_SizeDelta: {x: 59, y: 59} + m_AnchoredPosition: {x: -170, y: 10} + m_SizeDelta: {x: 140, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5328150795492567693 CanvasRenderer: diff --git a/Assets/Resources/UI/Panel/PanelBuyNoAds.prefab b/Assets/Resources/UI/Panel/PanelBuyNoAds.prefab index c13a9612..6807b193 100644 --- a/Assets/Resources/UI/Panel/PanelBuyNoAds.prefab +++ b/Assets/Resources/UI/Panel/PanelBuyNoAds.prefab @@ -891,7 +891,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 30, y: -480} - m_SizeDelta: {x: 643, y: 453} + m_SizeDelta: {x: 650, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8246720836436988867 CanvasRenderer: diff --git a/Assets/Resources/UI/Panel/PanelMain.prefab b/Assets/Resources/UI/Panel/PanelMain.prefab index 3c22a611..220dcfa0 100644 --- a/Assets/Resources/UI/Panel/PanelMain.prefab +++ b/Assets/Resources/UI/Panel/PanelMain.prefab @@ -1,5 +1,153 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &88345127308207250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2096328026943153785} + - component: {fileID: 2105736278030796797} + - component: {fileID: 6531215532057013103} + m_Layer: 5 + m_Name: Gob_Current + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2096328026943153785 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88345127308207250} + 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_Children: [] + m_Father: {fileID: 2523035879577423929} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 21, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2105736278030796797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88345127308207250} + m_CullTransparentMesh: 0 +--- !u!114 &6531215532057013103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88345127308207250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &341174996567455331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5914260918129865925} + - component: {fileID: 3064012439867646665} + - component: {fileID: 5047245918213096051} + m_Layer: 5 + m_Name: Gob_Passed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5914260918129865925 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341174996567455331} + 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_Children: [] + m_Father: {fileID: 5196078436444153842} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3064012439867646665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341174996567455331} + m_CullTransparentMesh: 0 +--- !u!114 &5047245918213096051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341174996567455331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &347159625097646545 GameObject: m_ObjectHideFlags: 0 @@ -35,7 +183,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} + m_SizeDelta: {x: 21, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4534913575264117451 CanvasRenderer: @@ -74,80 +222,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &462812896399365388 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5337209003065960958} - - component: {fileID: 1740598217244859430} - - component: {fileID: 415374550196007212} - m_Layer: 5 - m_Name: Gob_Current - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5337209003065960958 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462812896399365388} - 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_Children: [] - m_Father: {fileID: 93199372003478858} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1740598217244859430 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462812896399365388} - m_CullTransparentMesh: 0 ---- !u!114 &415374550196007212 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462812896399365388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &494434106534139538 GameObject: m_ObjectHideFlags: 0 @@ -226,7 +300,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Level 1 ---- !u!1 &668189443564442183 +--- !u!1 &549385760899605244 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -234,50 +308,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4691016881423417298} - - component: {fileID: 4823287518143983937} - - component: {fileID: 8011267675395079001} + - component: {fileID: 7427776031314280808} + - component: {fileID: 3475551186311603290} + - component: {fileID: 254503561249739259} + - component: {fileID: 1698232441923701620} m_Layer: 5 - m_Name: Gob_Current + m_Name: LevelSpot1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4691016881423417298 + m_IsActive: 1 +--- !u!224 &7427776031314280808 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 668189443564442183} + m_GameObject: {fileID: 549385760899605244} 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_Children: [] - m_Father: {fileID: 2897847694323276109} + m_Children: + - {fileID: 5019047556094770498} + - {fileID: 3450440308961387460} + m_Father: {fileID: 160627036028746682} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4823287518143983937 +--- !u!222 &3475551186311603290 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 668189443564442183} + m_GameObject: {fileID: 549385760899605244} m_CullTransparentMesh: 0 ---- !u!114 &8011267675395079001 +--- !u!114 &254503561249739259 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 668189443564442183} + m_GameObject: {fileID: 549385760899605244} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -290,7 +367,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} + m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -300,6 +377,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1698232441923701620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 549385760899605244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} + m_Name: + m_EditorClassIdentifier: + mGobPassed: {fileID: 4958405187677985108} + mGobCurrent: {fileID: 4793619603719427163} --- !u!1 &1025082962712263159 GameObject: m_ObjectHideFlags: 0 @@ -374,6 +465,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1041630636268581538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4705122744077213426} + - component: {fileID: 6045832456167457450} + - component: {fileID: 3429274402869891880} + m_Layer: 5 + m_Name: Gob_Passed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4705122744077213426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041630636268581538} + 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_Children: [] + m_Father: {fileID: 8534795488330053595} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6045832456167457450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041630636268581538} + m_CullTransparentMesh: 0 +--- !u!114 &3429274402869891880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041630636268581538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1138272702294080226 GameObject: m_ObjectHideFlags: 0 @@ -410,97 +575,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1188319976812968213 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7418649558972127182} - - component: {fileID: 2680255345703247083} - - component: {fileID: 1114777305040506891} - - component: {fileID: 4786616906836933269} - m_Layer: 5 - m_Name: LevelSpot1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7418649558972127182 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188319976812968213} - 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_Children: - - {fileID: 2203949687979270533} - - {fileID: 6614118661839338472} - m_Father: {fileID: 160627036028746682} - m_RootOrder: 1 - 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: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2680255345703247083 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188319976812968213} - m_CullTransparentMesh: 0 ---- !u!114 &1114777305040506891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188319976812968213} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4786616906836933269 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188319976812968213} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} - m_Name: - m_EditorClassIdentifier: - mGobPassed: {fileID: 1959202661463452693} - mGobCurrent: {fileID: 1536488317206087542} --- !u!1 &1461446512593791560 GameObject: m_ObjectHideFlags: 0 @@ -538,80 +612,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -70} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1536488317206087542 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6614118661839338472} - - component: {fileID: 4430023464897534704} - - component: {fileID: 3500019784416630002} - m_Layer: 5 - m_Name: Gob_Current - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6614118661839338472 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536488317206087542} - 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_Children: [] - m_Father: {fileID: 7418649558972127182} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4430023464897534704 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536488317206087542} - m_CullTransparentMesh: 0 ---- !u!114 &3500019784416630002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536488317206087542} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1576383521388248712 GameObject: m_ObjectHideFlags: 0 @@ -647,7 +647,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5057769538751003817 CanvasRenderer: @@ -686,7 +686,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1870362798988202302 +--- !u!1 &1697561972630177047 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -694,53 +694,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1836263730962196646} - - component: {fileID: 6542839346535561790} - - component: {fileID: 2615857606509040341} - - component: {fileID: 478755022276725063} + - component: {fileID: 3171405644023656730} + - component: {fileID: 162389971438533747} + - component: {fileID: 2764990918821951335} m_Layer: 5 - m_Name: LevelSpot5 + m_Name: Gob_Current m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1836263730962196646 + m_IsActive: 0 +--- !u!224 &3171405644023656730 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870362798988202302} + m_GameObject: {fileID: 1697561972630177047} 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_Children: - - {fileID: 7282098446455897891} - - {fileID: 15598054121988044} - m_Father: {fileID: 160627036028746682} - m_RootOrder: 5 + m_Children: [] + m_Father: {fileID: 8534795488330053595} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 21, y: 68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6542839346535561790 +--- !u!222 &162389971438533747 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870362798988202302} + m_GameObject: {fileID: 1697561972630177047} m_CullTransparentMesh: 0 ---- !u!114 &2615857606509040341 +--- !u!114 &2764990918821951335 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870362798988202302} + m_GameObject: {fileID: 1697561972630177047} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -753,7 +750,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} + m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -763,20 +760,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &478755022276725063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870362798988202302} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} - m_Name: - m_EditorClassIdentifier: - mGobPassed: {fileID: 3610209279484840346} - mGobCurrent: {fileID: 9048234221063186642} --- !u!1 &1885792613181088371 GameObject: m_ObjectHideFlags: 0 @@ -959,154 +942,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Key: Free ---- !u!1 &1959202661463452693 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2203949687979270533} - - component: {fileID: 8547062243399204561} - - component: {fileID: 6109805379196938954} - m_Layer: 5 - m_Name: Gob_Passed - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2203949687979270533 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959202661463452693} - 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_Children: [] - m_Father: {fileID: 7418649558972127182} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8547062243399204561 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959202661463452693} - m_CullTransparentMesh: 0 ---- !u!114 &6109805379196938954 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959202661463452693} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2065162316589172374 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 302950109251062736} - - component: {fileID: 3823865850873274169} - - component: {fileID: 7512660686166253060} - m_Layer: 5 - m_Name: Gob_Current - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &302950109251062736 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065162316589172374} - 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_Children: [] - m_Father: {fileID: 1311662089578914181} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3823865850873274169 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065162316589172374} - m_CullTransparentMesh: 0 ---- !u!114 &7512660686166253060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065162316589172374} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2105665707971977222 GameObject: m_ObjectHideFlags: 0 @@ -1261,7 +1096,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 791356b2c7d5c444980c1472ffa8f1ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2266369042430148101 +--- !u!1 &2232849303883700875 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1269,100 +1104,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 93199372003478858} - - component: {fileID: 4929508149333766805} - - component: {fileID: 1701981025490148829} - - component: {fileID: 3144521851051597837} - m_Layer: 5 - m_Name: LevelSpot3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &93199372003478858 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2266369042430148101} - 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_Children: - - {fileID: 4562095805207329818} - - {fileID: 5337209003065960958} - m_Father: {fileID: 160627036028746682} - m_RootOrder: 3 - 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: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4929508149333766805 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2266369042430148101} - m_CullTransparentMesh: 0 ---- !u!114 &1701981025490148829 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2266369042430148101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3144521851051597837 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2266369042430148101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} - m_Name: - m_EditorClassIdentifier: - mGobPassed: {fileID: 8226871276370979131} - mGobCurrent: {fileID: 462812896399365388} ---- !u!1 &2325899994511081218 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9158392161796516167} - - component: {fileID: 5137122618842860617} - - component: {fileID: 7586008566941116071} + - component: {fileID: 815144270341113561} + - component: {fileID: 6414065152836005100} + - component: {fileID: 1004345016618856273} m_Layer: 5 m_Name: Gob_Passed m_TagString: Untagged @@ -1370,40 +1114,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9158392161796516167 +--- !u!224 &815144270341113561 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2325899994511081218} + m_GameObject: {fileID: 2232849303883700875} 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_Children: [] - m_Father: {fileID: 3563678523394202464} + m_Father: {fileID: 9826108332326407} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5137122618842860617 +--- !u!222 &6414065152836005100 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2325899994511081218} + m_GameObject: {fileID: 2232849303883700875} m_CullTransparentMesh: 0 ---- !u!114 &7586008566941116071 +--- !u!114 &1004345016618856273 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2325899994511081218} + m_GameObject: {fileID: 2232849303883700875} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1426,6 +1170,171 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2637012743963528169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2033096467802574585} + - component: {fileID: 6154667200077044978} + - component: {fileID: 1141547425918754512} + m_Layer: 5 + m_Name: Gob_Current + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2033096467802574585 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2637012743963528169} + 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_Children: [] + m_Father: {fileID: 609722961939116619} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 21, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6154667200077044978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2637012743963528169} + m_CullTransparentMesh: 0 +--- !u!114 &1141547425918754512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2637012743963528169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3070399221132690426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9826108332326407} + - component: {fileID: 7711841993150981670} + - component: {fileID: 1353246936842037938} + - component: {fileID: 1702590634000584877} + m_Layer: 5 + m_Name: LevelSpot4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9826108332326407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3070399221132690426} + 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_Children: + - {fileID: 815144270341113561} + - {fileID: 2206944374429903381} + m_Father: {fileID: 160627036028746682} + m_RootOrder: 4 + 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: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7711841993150981670 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3070399221132690426} + m_CullTransparentMesh: 0 +--- !u!114 &1353246936842037938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3070399221132690426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1702590634000584877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3070399221132690426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} + m_Name: + m_EditorClassIdentifier: + mGobPassed: {fileID: 2232849303883700875} + mGobCurrent: {fileID: 7562376218783224804} --- !u!1 &3161404619406291455 GameObject: m_ObjectHideFlags: 0 @@ -1537,7 +1446,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3610209279484840346 +--- !u!1 &3756923512549397010 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1545,201 +1454,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7282098446455897891} - - component: {fileID: 1316318425661166825} - - component: {fileID: 5794417560869278043} + - component: {fileID: 8495512251989835358} + - component: {fileID: 7090999790937458080} + - component: {fileID: 4353363390839172845} + - component: {fileID: 8733951749909475092} m_Layer: 5 - m_Name: Gob_Passed + m_Name: LevelSpot2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7282098446455897891 +--- !u!224 &8495512251989835358 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3610209279484840346} - 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_Children: [] - m_Father: {fileID: 1836263730962196646} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1316318425661166825 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3610209279484840346} - m_CullTransparentMesh: 0 ---- !u!114 &5794417560869278043 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3610209279484840346} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3691917740443049109 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7351746918730587986} - - component: {fileID: 4644150568179604601} - - component: {fileID: 5775147994800119577} - m_Layer: 5 - m_Name: Gob_Passed - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7351746918730587986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3691917740443049109} - 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_Children: [] - m_Father: {fileID: 2897847694323276109} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4644150568179604601 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3691917740443049109} - m_CullTransparentMesh: 0 ---- !u!114 &5775147994800119577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3691917740443049109} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3952044533678723684 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5391765805570043411} - - component: {fileID: 317591028347588416} - - component: {fileID: 6715896912629132331} - - component: {fileID: 2860478231190226482} - m_Layer: 5 - m_Name: LevelSpot7 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5391765805570043411 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3952044533678723684} + m_GameObject: {fileID: 3756923512549397010} 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_Children: - - {fileID: 1989421066952472572} - - {fileID: 2700103609217362644} + - {fileID: 3508914934225460039} + - {fileID: 7207454647031394191} m_Father: {fileID: 160627036028746682} - m_RootOrder: 7 + m_RootOrder: 2 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: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &317591028347588416 +--- !u!222 &7090999790937458080 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3952044533678723684} + m_GameObject: {fileID: 3756923512549397010} m_CullTransparentMesh: 0 ---- !u!114 &6715896912629132331 +--- !u!114 &4353363390839172845 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3952044533678723684} + m_GameObject: {fileID: 3756923512549397010} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1762,20 +1523,94 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2860478231190226482 +--- !u!114 &8733951749909475092 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3952044533678723684} + m_GameObject: {fileID: 3756923512549397010} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} m_Name: m_EditorClassIdentifier: - mGobPassed: {fileID: 8782669394774057963} - mGobCurrent: {fileID: 7914330800011861139} + mGobPassed: {fileID: 8989977040946026191} + mGobCurrent: {fileID: 4148578275759482285} +--- !u!1 &4148578275759482285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7207454647031394191} + - component: {fileID: 4547022768160537054} + - component: {fileID: 409491877034835612} + m_Layer: 5 + m_Name: Gob_Current + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7207454647031394191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148578275759482285} + 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_Children: [] + m_Father: {fileID: 8495512251989835358} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 21, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4547022768160537054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148578275759482285} + m_CullTransparentMesh: 0 +--- !u!114 &409491877034835612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148578275759482285} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4170056086818981638 GameObject: m_ObjectHideFlags: 0 @@ -1805,15 +1640,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4460937584540800438} - - {fileID: 7418649558972127182} - - {fileID: 1311662089578914181} - - {fileID: 93199372003478858} - - {fileID: 2897847694323276109} - - {fileID: 1836263730962196646} - - {fileID: 2887984338402746915} - - {fileID: 5391765805570043411} - - {fileID: 8265568176058538456} - - {fileID: 3563678523394202464} + - {fileID: 7427776031314280808} + - {fileID: 8495512251989835358} + - {fileID: 8534795488330053595} + - {fileID: 9826108332326407} + - {fileID: 7082775520789520981} + - {fileID: 8780002645656237373} + - {fileID: 2523035879577423929} + - {fileID: 5196078436444153842} + - {fileID: 609722961939116619} m_Father: {fileID: 1933617375385930057} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1840,7 +1675,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 15 + m_Spacing: 20 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -1941,6 +1776,245 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 3, y: -3} m_UseGraphicAlpha: 1 +--- !u!1 &4793619603719427163 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3450440308961387460} + - component: {fileID: 8574339103750869044} + - component: {fileID: 5978611924288149830} + m_Layer: 5 + m_Name: Gob_Current + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3450440308961387460 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4793619603719427163} + 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_Children: [] + m_Father: {fileID: 7427776031314280808} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 21, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8574339103750869044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4793619603719427163} + m_CullTransparentMesh: 0 +--- !u!114 &5978611924288149830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4793619603719427163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4806635025210316334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7082775520789520981} + - component: {fileID: 4208540070213611617} + - component: {fileID: 6842035764393403783} + - component: {fileID: 7685652606105427487} + m_Layer: 5 + m_Name: LevelSpot5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7082775520789520981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806635025210316334} + 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_Children: + - {fileID: 5937779720711229319} + - {fileID: 2237310464093938805} + m_Father: {fileID: 160627036028746682} + m_RootOrder: 5 + 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: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4208540070213611617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806635025210316334} + m_CullTransparentMesh: 0 +--- !u!114 &6842035764393403783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806635025210316334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7685652606105427487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806635025210316334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} + m_Name: + m_EditorClassIdentifier: + mGobPassed: {fileID: 7895172012790811381} + mGobCurrent: {fileID: 6671380852612594710} +--- !u!1 &4958405187677985108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5019047556094770498} + - component: {fileID: 4142916057976073462} + - component: {fileID: 2116370316764962131} + m_Layer: 5 + m_Name: Gob_Passed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5019047556094770498 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4958405187677985108} + 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_Children: [] + m_Father: {fileID: 7427776031314280808} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4142916057976073462 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4958405187677985108} + m_CullTransparentMesh: 0 +--- !u!114 &2116370316764962131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4958405187677985108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4962990510582407956 GameObject: m_ObjectHideFlags: 0 @@ -2742,7 +2816,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0a2be44af705a4e148c1feff1a0fc9bc, type: 3} + m_Sprite: {fileID: 21300000, guid: 6c496f3f0473946c28f7614f3e9a4897, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3827,7 +3901,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 791356b2c7d5c444980c1472ffa8f1ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5020755377558975363 +--- !u!1 &5430972532215060733 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3835,53 +3909,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1311662089578914181} - - component: {fileID: 4450528019307531127} - - component: {fileID: 6389528485275436628} - - component: {fileID: 8749658835035144243} + - component: {fileID: 609722961939116619} + - component: {fileID: 1378730464282381412} + - component: {fileID: 6133597557699071865} + - component: {fileID: 5159948265347058080} m_Layer: 5 - m_Name: LevelSpot2 + m_Name: LevelSpot9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1311662089578914181 +--- !u!224 &609722961939116619 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5020755377558975363} + m_GameObject: {fileID: 5430972532215060733} 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_Children: - - {fileID: 1119442072835618360} - - {fileID: 302950109251062736} + - {fileID: 8302885703788293056} + - {fileID: 2033096467802574585} m_Father: {fileID: 160627036028746682} - m_RootOrder: 2 + m_RootOrder: 9 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: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4450528019307531127 +--- !u!222 &1378730464282381412 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5020755377558975363} + m_GameObject: {fileID: 5430972532215060733} m_CullTransparentMesh: 0 ---- !u!114 &6389528485275436628 +--- !u!114 &6133597557699071865 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5020755377558975363} + m_GameObject: {fileID: 5430972532215060733} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -3904,20 +3978,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8749658835035144243 +--- !u!114 &5159948265347058080 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5020755377558975363} + m_GameObject: {fileID: 5430972532215060733} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} m_Name: m_EditorClassIdentifier: - mGobPassed: {fileID: 7595169282128341734} - mGobCurrent: {fileID: 2065162316589172374} + mGobPassed: {fileID: 8433249810252289370} + mGobCurrent: {fileID: 2637012743963528169} --- !u!1 &5582915255698347449 GameObject: m_ObjectHideFlags: 0 @@ -4026,7 +4100,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Key: Free ---- !u!1 &5962723759868101090 +--- !u!1 &5977486378497885823 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4034,9 +4108,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2077176389054397081} - - component: {fileID: 699347769159152274} - - component: {fileID: 4252952602210045584} + - component: {fileID: 2523035879577423929} + - component: {fileID: 4441200680873082888} + - component: {fileID: 2336165039529534293} + - component: {fileID: 8851438227059283705} + m_Layer: 5 + m_Name: LevelSpot7 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2523035879577423929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5977486378497885823} + 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_Children: + - {fileID: 989438158607083219} + - {fileID: 2096328026943153785} + m_Father: {fileID: 160627036028746682} + m_RootOrder: 7 + 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: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4441200680873082888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5977486378497885823} + m_CullTransparentMesh: 0 +--- !u!114 &2336165039529534293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5977486378497885823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8851438227059283705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5977486378497885823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} + m_Name: + m_EditorClassIdentifier: + mGobPassed: {fileID: 6266007179566974804} + mGobCurrent: {fileID: 88345127308207250} +--- !u!1 &6266007179566974804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 989438158607083219} + - component: {fileID: 3374972025253000197} + - component: {fileID: 2341026746134585038} m_Layer: 5 m_Name: Gob_Passed m_TagString: Untagged @@ -4044,40 +4209,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2077176389054397081 +--- !u!224 &989438158607083219 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5962723759868101090} + m_GameObject: {fileID: 6266007179566974804} 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_Children: [] - m_Father: {fileID: 8265568176058538456} + m_Father: {fileID: 2523035879577423929} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &699347769159152274 +--- !u!222 &3374972025253000197 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5962723759868101090} + m_GameObject: {fileID: 6266007179566974804} m_CullTransparentMesh: 0 ---- !u!114 &4252952602210045584 +--- !u!114 &2341026746134585038 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5962723759868101090} + m_GameObject: {fileID: 6266007179566974804} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -4100,7 +4265,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6794990375044568220 +--- !u!1 &6294354889752874084 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4108,100 +4273,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2897847694323276109} - - component: {fileID: 6528217859585524341} - - component: {fileID: 4150904565823555450} - - component: {fileID: 6011401334027538139} - m_Layer: 5 - m_Name: LevelSpot4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2897847694323276109 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794990375044568220} - 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_Children: - - {fileID: 7351746918730587986} - - {fileID: 4691016881423417298} - m_Father: {fileID: 160627036028746682} - m_RootOrder: 4 - 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: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6528217859585524341 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794990375044568220} - m_CullTransparentMesh: 0 ---- !u!114 &4150904565823555450 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794990375044568220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6011401334027538139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6794990375044568220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} - m_Name: - m_EditorClassIdentifier: - mGobPassed: {fileID: 3691917740443049109} - mGobCurrent: {fileID: 668189443564442183} ---- !u!1 &6988643257092271468 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5176186246305525395} - - component: {fileID: 7135057402299794278} - - component: {fileID: 1704664321169695355} + - component: {fileID: 4664573088742409404} + - component: {fileID: 1790449480368443011} + - component: {fileID: 7972703679129887181} m_Layer: 5 m_Name: Gob_Current m_TagString: Untagged @@ -4209,40 +4283,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &5176186246305525395 +--- !u!224 &4664573088742409404 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6988643257092271468} + m_GameObject: {fileID: 6294354889752874084} 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_Children: [] - m_Father: {fileID: 8265568176058538456} + m_Father: {fileID: 5196078436444153842} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} + m_SizeDelta: {x: 21, y: 68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7135057402299794278 +--- !u!222 &1790449480368443011 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6988643257092271468} + m_GameObject: {fileID: 6294354889752874084} m_CullTransparentMesh: 0 ---- !u!114 &1704664321169695355 +--- !u!114 &7972703679129887181 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6988643257092271468} + m_GameObject: {fileID: 6294354889752874084} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -4265,7 +4339,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6998419230867818515 +--- !u!1 &6338460315997541483 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4273,53 +4347,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3563678523394202464} - - component: {fileID: 8833054842688580805} - - component: {fileID: 7479029121623006302} - - component: {fileID: 2010281493556263651} + - component: {fileID: 5196078436444153842} + - component: {fileID: 3973880691134662444} + - component: {fileID: 4001073766891222993} + - component: {fileID: 8391705547700915961} m_Layer: 5 - m_Name: LevelSpot9 + m_Name: LevelSpot8 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3563678523394202464 +--- !u!224 &5196078436444153842 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6998419230867818515} + m_GameObject: {fileID: 6338460315997541483} 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_Children: - - {fileID: 9158392161796516167} - - {fileID: 8230664844038168495} + - {fileID: 5914260918129865925} + - {fileID: 4664573088742409404} m_Father: {fileID: 160627036028746682} - m_RootOrder: 9 + m_RootOrder: 8 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: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8833054842688580805 +--- !u!222 &3973880691134662444 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6998419230867818515} + m_GameObject: {fileID: 6338460315997541483} m_CullTransparentMesh: 0 ---- !u!114 &7479029121623006302 +--- !u!114 &4001073766891222993 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6998419230867818515} + m_GameObject: {fileID: 6338460315997541483} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -4342,21 +4416,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2010281493556263651 +--- !u!114 &8391705547700915961 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6998419230867818515} + m_GameObject: {fileID: 6338460315997541483} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} m_Name: m_EditorClassIdentifier: - mGobPassed: {fileID: 2325899994511081218} - mGobCurrent: {fileID: 8434748733475067684} ---- !u!1 &7262122879910172885 + mGobPassed: {fileID: 341174996567455331} + mGobCurrent: {fileID: 6294354889752874084} +--- !u!1 &6671380852612594710 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4364,9 +4438,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4221288564866778480} - - component: {fileID: 4490882880178928576} - - component: {fileID: 200885056298339528} + - component: {fileID: 2237310464093938805} + - component: {fileID: 1800376794569954914} + - component: {fileID: 2122717394974540078} m_Layer: 5 m_Name: Gob_Current m_TagString: Untagged @@ -4374,40 +4448,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &4221288564866778480 +--- !u!224 &2237310464093938805 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7262122879910172885} + m_GameObject: {fileID: 6671380852612594710} 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_Children: [] - m_Father: {fileID: 2887984338402746915} + m_Father: {fileID: 7082775520789520981} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} + m_SizeDelta: {x: 21, y: 68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4490882880178928576 +--- !u!222 &1800376794569954914 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7262122879910172885} + m_GameObject: {fileID: 6671380852612594710} m_CullTransparentMesh: 0 ---- !u!114 &200885056298339528 +--- !u!114 &2122717394974540078 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7262122879910172885} + m_GameObject: {fileID: 6671380852612594710} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -4430,6 +4504,171 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7251430641844109883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8534795488330053595} + - component: {fileID: 8529221542915007655} + - component: {fileID: 5728137782801687277} + - component: {fileID: 8190259528428772587} + m_Layer: 5 + m_Name: LevelSpot3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8534795488330053595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7251430641844109883} + 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_Children: + - {fileID: 4705122744077213426} + - {fileID: 3171405644023656730} + m_Father: {fileID: 160627036028746682} + m_RootOrder: 3 + 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: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8529221542915007655 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7251430641844109883} + m_CullTransparentMesh: 0 +--- !u!114 &5728137782801687277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7251430641844109883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8190259528428772587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7251430641844109883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} + m_Name: + m_EditorClassIdentifier: + mGobPassed: {fileID: 1041630636268581538} + mGobCurrent: {fileID: 1697561972630177047} +--- !u!1 &7320767435804752363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8485773386681192542} + - component: {fileID: 2601012232115973969} + - component: {fileID: 5670870538523351389} + m_Layer: 5 + m_Name: Gob_Passed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8485773386681192542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7320767435804752363} + 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_Children: [] + m_Father: {fileID: 8780002645656237373} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2601012232115973969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7320767435804752363} + m_CullTransparentMesh: 0 +--- !u!114 &5670870538523351389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7320767435804752363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7364201638589719851 GameObject: m_ObjectHideFlags: 0 @@ -4619,7 +4858,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -70} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7595169282128341734 +--- !u!1 &7562376218783224804 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4627,50 +4866,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1119442072835618360} - - component: {fileID: 863034755707025098} - - component: {fileID: 7854349361330103567} + - component: {fileID: 2206944374429903381} + - component: {fileID: 5428407327794121097} + - component: {fileID: 4490458311862429078} m_Layer: 5 - m_Name: Gob_Passed + m_Name: Gob_Current m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1119442072835618360 + m_IsActive: 0 +--- !u!224 &2206944374429903381 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7595169282128341734} + m_GameObject: {fileID: 7562376218783224804} 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_Children: [] - m_Father: {fileID: 1311662089578914181} - m_RootOrder: 0 + m_Father: {fileID: 9826108332326407} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 21, y: 68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &863034755707025098 +--- !u!222 &5428407327794121097 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7595169282128341734} + m_GameObject: {fileID: 7562376218783224804} m_CullTransparentMesh: 0 ---- !u!114 &7854349361330103567 +--- !u!114 &4490458311862429078 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7595169282128341734} + m_GameObject: {fileID: 7562376218783224804} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -4683,7 +4922,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} + m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4767,7 +5006,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7914330800011861139 +--- !u!1 &7895172012790811381 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4775,9 +5014,83 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2700103609217362644} - - component: {fileID: 250954283525313071} - - component: {fileID: 4392337397068974807} + - component: {fileID: 5937779720711229319} + - component: {fileID: 6358151160453451291} + - component: {fileID: 5207814701074010008} + m_Layer: 5 + m_Name: Gob_Passed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5937779720711229319 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7895172012790811381} + 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_Children: [] + m_Father: {fileID: 7082775520789520981} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 22, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6358151160453451291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7895172012790811381} + m_CullTransparentMesh: 0 +--- !u!114 &5207814701074010008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7895172012790811381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7937242632503388140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3408464903804881664} + - component: {fileID: 3806404506912185802} + - component: {fileID: 2025521787838526685} m_Layer: 5 m_Name: Gob_Current m_TagString: Untagged @@ -4785,40 +5098,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &2700103609217362644 +--- !u!224 &3408464903804881664 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7914330800011861139} + m_GameObject: {fileID: 7937242632503388140} 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_Children: [] - m_Father: {fileID: 5391765805570043411} + m_Father: {fileID: 8780002645656237373} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} + m_SizeDelta: {x: 21, y: 68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &250954283525313071 +--- !u!222 &3806404506912185802 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7914330800011861139} + m_GameObject: {fileID: 7937242632503388140} m_CullTransparentMesh: 0 ---- !u!114 &4392337397068974807 +--- !u!114 &2025521787838526685 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7914330800011861139} + m_GameObject: {fileID: 7937242632503388140} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -5006,7 +5319,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8226871276370979131 +--- !u!1 &8433249810252289370 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5014,9 +5327,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4562095805207329818} - - component: {fileID: 1374786865307494198} - - component: {fileID: 9009188482609851623} + - component: {fileID: 8302885703788293056} + - component: {fileID: 3036222328383686917} + - component: {fileID: 4889763435893893152} m_Layer: 5 m_Name: Gob_Passed m_TagString: Untagged @@ -5024,40 +5337,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4562095805207329818 +--- !u!224 &8302885703788293056 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8226871276370979131} + m_GameObject: {fileID: 8433249810252289370} 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_Children: [] - m_Father: {fileID: 93199372003478858} + m_Father: {fileID: 609722961939116619} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1374786865307494198 +--- !u!222 &3036222328383686917 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8226871276370979131} + m_GameObject: {fileID: 8433249810252289370} m_CullTransparentMesh: 0 ---- !u!114 &9009188482609851623 +--- !u!114 &4889763435893893152 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8226871276370979131} + m_GameObject: {fileID: 8433249810252289370} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -5080,171 +5393,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8258200661539730919 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2887984338402746915} - - component: {fileID: 8466594183327491656} - - component: {fileID: 5472234054156093062} - - component: {fileID: 261321726308265315} - m_Layer: 5 - m_Name: LevelSpot6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2887984338402746915 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8258200661539730919} - 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_Children: - - {fileID: 6412073939359015951} - - {fileID: 4221288564866778480} - m_Father: {fileID: 160627036028746682} - m_RootOrder: 6 - 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: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8466594183327491656 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8258200661539730919} - m_CullTransparentMesh: 0 ---- !u!114 &5472234054156093062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8258200661539730919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63bc89bf283a84fa1b93c4ca8e83e18c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &261321726308265315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8258200661539730919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} - m_Name: - m_EditorClassIdentifier: - mGobPassed: {fileID: 9060604026339029852} - mGobCurrent: {fileID: 7262122879910172885} ---- !u!1 &8434748733475067684 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8230664844038168495} - - component: {fileID: 5962869665901883157} - - component: {fileID: 7897825556304482756} - m_Layer: 5 - m_Name: Gob_Current - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8230664844038168495 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8434748733475067684} - 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_Children: [] - m_Father: {fileID: 3563678523394202464} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5962869665901883157 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8434748733475067684} - m_CullTransparentMesh: 0 ---- !u!114 &7897825556304482756 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8434748733475067684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8459521891417902229 GameObject: m_ObjectHideFlags: 0 @@ -5320,7 +5468,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6298037646220511030 CanvasRenderer: @@ -5373,7 +5521,7 @@ MonoBehaviour: m_EditorClassIdentifier: mGobPassed: {fileID: 1576383521388248712} mGobCurrent: {fileID: 347159625097646545} ---- !u!1 &8782669394774057963 +--- !u!1 &8683933637554364460 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5381,127 +5529,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1989421066952472572} - - component: {fileID: 8003723610555312773} - - component: {fileID: 1941009727039111206} + - component: {fileID: 8780002645656237373} + - component: {fileID: 2417963107210309567} + - component: {fileID: 3066255603624501960} + - component: {fileID: 2300939995401840681} m_Layer: 5 - m_Name: Gob_Passed + m_Name: LevelSpot6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1989421066952472572 +--- !u!224 &8780002645656237373 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782669394774057963} - 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_Children: [] - m_Father: {fileID: 5391765805570043411} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8003723610555312773 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782669394774057963} - m_CullTransparentMesh: 0 ---- !u!114 &1941009727039111206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782669394774057963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4084674f953ff46f596e834806078ffa, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8928716703771107319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8265568176058538456} - - component: {fileID: 3062978960833470882} - - component: {fileID: 2955728088255461160} - - component: {fileID: 7251099803146034589} - m_Layer: 5 - m_Name: LevelSpot8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8265568176058538456 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8928716703771107319} + m_GameObject: {fileID: 8683933637554364460} 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_Children: - - {fileID: 2077176389054397081} - - {fileID: 5176186246305525395} + - {fileID: 8485773386681192542} + - {fileID: 3408464903804881664} m_Father: {fileID: 160627036028746682} - m_RootOrder: 8 + m_RootOrder: 6 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: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3062978960833470882 +--- !u!222 &2417963107210309567 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8928716703771107319} + m_GameObject: {fileID: 8683933637554364460} m_CullTransparentMesh: 0 ---- !u!114 &2955728088255461160 +--- !u!114 &3066255603624501960 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8928716703771107319} + m_GameObject: {fileID: 8683933637554364460} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -5524,21 +5598,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7251099803146034589 +--- !u!114 &2300939995401840681 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8928716703771107319} + m_GameObject: {fileID: 8683933637554364460} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 656b728becaac47808dff5c385c59472, type: 3} m_Name: m_EditorClassIdentifier: - mGobPassed: {fileID: 5962723759868101090} - mGobCurrent: {fileID: 6988643257092271468} ---- !u!1 &9048234221063186642 + mGobPassed: {fileID: 7320767435804752363} + mGobCurrent: {fileID: 7937242632503388140} +--- !u!1 &8989977040946026191 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5546,83 +5620,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 15598054121988044} - - component: {fileID: 579408391023855287} - - component: {fileID: 2703666787444469597} - m_Layer: 5 - m_Name: Gob_Current - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &15598054121988044 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048234221063186642} - 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_Children: [] - m_Father: {fileID: 1836263730962196646} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &579408391023855287 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048234221063186642} - m_CullTransparentMesh: 0 ---- !u!114 &2703666787444469597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048234221063186642} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 777c5785cff5d4bc08f9aa964c66b09b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9060604026339029852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6412073939359015951} - - component: {fileID: 7349785080289546982} - - component: {fileID: 5495333897662866507} + - component: {fileID: 3508914934225460039} + - component: {fileID: 4843972391109668543} + - component: {fileID: 624784778840278083} m_Layer: 5 m_Name: Gob_Passed m_TagString: Untagged @@ -5630,40 +5630,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6412073939359015951 +--- !u!224 &3508914934225460039 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9060604026339029852} + m_GameObject: {fileID: 8989977040946026191} 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_Children: [] - m_Father: {fileID: 2887984338402746915} + m_Father: {fileID: 8495512251989835358} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 26, y: 45} + m_SizeDelta: {x: 22, y: 54} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7349785080289546982 +--- !u!222 &4843972391109668543 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9060604026339029852} + m_GameObject: {fileID: 8989977040946026191} m_CullTransparentMesh: 0 ---- !u!114 &5495333897662866507 +--- !u!114 &624784778840278083 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9060604026339029852} + m_GameObject: {fileID: 8989977040946026191} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} diff --git a/Assets/Resources/UI/Panel/PanelNewCard.prefab b/Assets/Resources/UI/Panel/PanelNewCard.prefab index 0b46bc2e..420eac49 100644 --- a/Assets/Resources/UI/Panel/PanelNewCard.prefab +++ b/Assets/Resources/UI/Panel/PanelNewCard.prefab @@ -33,7 +33,7 @@ RectTransform: - {fileID: 4100887267542740377} - {fileID: 4100887268180908564} m_Father: {fileID: 4100887268326626603} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -296,7 +296,6 @@ GameObject: m_Component: - component: {fileID: 4100887268326626603} - component: {fileID: 4100887268326626613} - - component: {fileID: 4100887268326626602} - component: {fileID: 4410068527988539273} m_Layer: 5 m_Name: Cvs_Bg @@ -317,6 +316,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4100887268968151799} + - {fileID: 8151694544439305804} - {fileID: 4100887269383533401} - {fileID: 4100887267413369885} m_Father: {fileID: 4100887269400890303} @@ -335,35 +335,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4100887268326626600} m_CullTransparentMesh: 0 ---- !u!114 &4100887268326626602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4100887268326626600} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 448d7f4d329d84bd78bec24f673bfed8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!225 &4410068527988539273 CanvasGroup: m_ObjectHideFlags: 0 @@ -790,8 +761,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: -90} - m_SizeDelta: {x: 59, y: 59} + m_AnchoredPosition: {x: -130, y: -15} + m_SizeDelta: {x: 140, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4100887268968151792 CanvasRenderer: @@ -1319,12 +1290,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4100887268326626603} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 370} - m_SizeDelta: {x: 300, y: 120} + m_AnchoredPosition: {x: 0, y: 365} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4100887269383533402 CanvasRenderer: @@ -1355,11 +1326,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 854bcbca5d2ec436a99262c14b058185, type: 3} - m_FontSize: 90 + m_FontSize: 80 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 50 - m_MaxSize: 90 + m_MinSize: 40 + m_MaxSize: 80 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1449,3 +1420,77 @@ MonoBehaviour: mCvsBg: {fileID: 4410068527988539273} mRctBg: {fileID: 4100887268326626603} mBtnClose: {fileID: 4100887268968151798} +--- !u!1 &8712958713148091819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8151694544439305804} + - component: {fileID: 802304501362426891} + - component: {fileID: 82444693205424236} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8151694544439305804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712958713148091819} + 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_Children: [] + m_Father: {fileID: 4100887268326626603} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 650, y: 835} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &802304501362426891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712958713148091819} + m_CullTransparentMesh: 0 +--- !u!114 &82444693205424236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712958713148091819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 448d7f4d329d84bd78bec24f673bfed8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Resources/UI/Panel/PanelResult.prefab b/Assets/Resources/UI/Panel/PanelResult.prefab index d7b5540b..9af3a343 100644 --- a/Assets/Resources/UI/Panel/PanelResult.prefab +++ b/Assets/Resources/UI/Panel/PanelResult.prefab @@ -735,7 +735,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -140} + m_AnchoredPosition: {x: 0, y: -75} m_SizeDelta: {x: 600, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1922694056494821568 @@ -910,7 +910,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -100.00003} + m_AnchoredPosition: {x: 0, y: -75} m_SizeDelta: {x: 600, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1922694056745337545 @@ -1156,8 +1156,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 500} - m_SizeDelta: {x: 839, y: 601} + m_AnchoredPosition: {x: 0, y: 540} + m_SizeDelta: {x: 975, y: 614} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1922694057119930709 CanvasRenderer: @@ -3438,7 +3438,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 839, y: 682} + m_SizeDelta: {x: 975, y: 614} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8054677996992473022 CanvasRenderer: diff --git a/Assets/Resources/UI/Panel/PanelSettings.prefab b/Assets/Resources/UI/Panel/PanelSettings.prefab index 0c521049..3c90f80c 100644 --- a/Assets/Resources/UI/Panel/PanelSettings.prefab +++ b/Assets/Resources/UI/Panel/PanelSettings.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -220, y: 0} + m_AnchoredPosition: {x: -290, y: 0} m_SizeDelta: {x: 102, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3677786554963842864 @@ -348,7 +348,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -220, y: 0} + m_AnchoredPosition: {x: -290, y: 0} m_SizeDelta: {x: 115, y: 93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1099325668339857564 @@ -473,7 +473,6 @@ GameObject: m_Component: - component: {fileID: 7881832265602893129} - component: {fileID: 1771596450703340243} - - component: {fileID: 839138275584915616} - component: {fileID: 330438927} m_Layer: 5 m_Name: Rct_Bg @@ -494,6 +493,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2052304661476621039} + - {fileID: 6524139624328706747} - {fileID: 5809070286115461635} - {fileID: 254988763727472262} - {fileID: 1619422284501751595} @@ -505,7 +505,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 650, y: 899} + m_SizeDelta: {x: 883, y: 1135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1771596450703340243 CanvasRenderer: @@ -515,35 +515,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2045426547071788843} m_CullTransparentMesh: 0 ---- !u!114 &839138275584915616 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2045426547071788843} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 448d7f4d329d84bd78bec24f673bfed8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!225 &330438927 CanvasGroup: m_ObjectHideFlags: 0 @@ -587,7 +558,7 @@ RectTransform: - {fileID: 587044426748704617} - {fileID: 7960617035189493486} m_Father: {fileID: 7881832265602893129} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -612,7 +583,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 50 + m_Spacing: 100 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -912,7 +883,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 100, y: 0} + m_AnchoredPosition: {x: 135, y: 0} m_SizeDelta: {x: 256, y: 99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1707684695542142310 @@ -995,6 +966,80 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3613535508986234348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6524139624328706747} + - component: {fileID: 1822743523879687347} + - component: {fileID: 7552175895029101622} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6524139624328706747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3613535508986234348} + 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_Children: [] + m_Father: {fileID: 7881832265602893129} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 883, y: 1135} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1822743523879687347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3613535508986234348} + m_CullTransparentMesh: 0 +--- !u!114 &7552175895029101622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3613535508986234348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 448d7f4d329d84bd78bec24f673bfed8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4147851940758800685 GameObject: m_ObjectHideFlags: 0 @@ -1030,11 +1075,11 @@ RectTransform: - {fileID: 4291628159051905588} - {fileID: 1576060997041729098} m_Father: {fileID: 7881832265602893129} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 90, y: 165} + m_AnchoredPosition: {x: 140, y: 200} m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4869352603480645018 @@ -1317,11 +1362,11 @@ RectTransform: - {fileID: 6727274762510791565} - {fileID: 748729779826321423} m_Father: {fileID: 7881832265602893129} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 90, y: 35} + m_AnchoredPosition: {x: 140, y: 35} m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4394425357898503677 @@ -1527,7 +1572,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -135, y: 0} + m_AnchoredPosition: {x: -155, y: 0} m_SizeDelta: {x: 111, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4797042351207194440 @@ -1602,8 +1647,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: -90} - m_SizeDelta: {x: 59, y: 59} + m_AnchoredPosition: {x: -155, y: 25} + m_SizeDelta: {x: 140, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3074788966489469719 CanvasRenderer: @@ -2004,11 +2049,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7881832265602893129} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 370} + m_AnchoredPosition: {x: 0, y: 480} m_SizeDelta: {x: 350, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1513733211486530745 @@ -2095,11 +2140,11 @@ RectTransform: - {fileID: 3285747056779483626} - {fileID: 3183316447099544424} m_Father: {fileID: 7881832265602893129} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -90} + m_AnchoredPosition: {x: 0, y: -160} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9049642900839062096 diff --git a/Assets/Resources/UI/Panel/PanelTopBar.prefab b/Assets/Resources/UI/Panel/PanelTopBar.prefab index 6f8ef86e..c2d95fc6 100644 --- a/Assets/Resources/UI/Panel/PanelTopBar.prefab +++ b/Assets/Resources/UI/Panel/PanelTopBar.prefab @@ -528,7 +528,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.22798398, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -622,7 +622,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0.046190023, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index db1f8924..9d7137f8 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -614,6 +614,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 922eb051283c84bc684d06fc0d6ebc70, type: 3} m_Name: m_EditorClassIdentifier: + mBP: 0 mIsPlayer: 0 mCtnSlots: {fileID: 230701048} mRdrFloor: {fileID: 1753392090} @@ -1029,6 +1030,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 922eb051283c84bc684d06fc0d6ebc70, type: 3} m_Name: m_EditorClassIdentifier: + mBP: 0 mIsPlayer: 1 mCtnSlots: {fileID: 584885978} mRdrFloor: {fileID: 978669086} @@ -3874,66 +3876,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 981520862} m_Modifications: - - target: {fileID: 128742387097661522, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 128742387097661522, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 128742387097661522, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 128742387097661522, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 128742387097661522, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 536.5 - objectReference: {fileID: 0} - - target: {fileID: 128742387097661522, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -885 - objectReference: {fileID: 0} - - target: {fileID: 392468752120818355, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 392468752120818355, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 392468752120818355, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 392468752120818355, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 392468752120818355, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 186.5 - objectReference: {fileID: 0} - - target: {fileID: 392468752120818355, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -185 - objectReference: {fileID: 0} - target: {fileID: 1062115953386859996, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y @@ -3992,7 +3934,7 @@ PrefabInstance: - target: {fileID: 1062115954846403414, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y - value: 0.41843975 + value: 0.53409094 objectReference: {fileID: 0} - target: {fileID: 1062115955107940373, guid: 99584e5b221414bc6801676403d15c80, type: 3} @@ -4112,97 +4054,37 @@ PrefabInstance: - target: {fileID: 1062115955254514257, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y - value: 1410 + value: 1760 objectReference: {fileID: 0} - - target: {fileID: 1331341710355873903, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 1978009248506725388, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1331341710355873903, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 1978009248506725388, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1331341710355873903, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 1978009248506725388, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.x value: 350 objectReference: {fileID: 0} - - target: {fileID: 1331341710355873903, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 1978009248506725388, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y value: 350 objectReference: {fileID: 0} - - target: {fileID: 1331341710355873903, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 536.5 - objectReference: {fileID: 0} - - target: {fileID: 1331341710355873903, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -885 - objectReference: {fileID: 0} - - target: {fileID: 1609278631060949773, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1609278631060949773, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1609278631060949773, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 1609278631060949773, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 1609278631060949773, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 1978009248506725388, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.x value: 186.5 objectReference: {fileID: 0} - - target: {fileID: 1609278631060949773, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 1978009248506725388, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.y - value: -535 - objectReference: {fileID: 0} - - target: {fileID: 1670794275976220275, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1670794275976220275, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1670794275976220275, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 1670794275976220275, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 1670794275976220275, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 536.5 - objectReference: {fileID: 0} - - target: {fileID: 1670794275976220275, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -185 + value: -1585 objectReference: {fileID: 0} - target: {fileID: 2049595956650748457, guid: 99584e5b221414bc6801676403d15c80, type: 3} @@ -4234,36 +4116,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -1235 objectReference: {fileID: 0} - - target: {fileID: 2154936599638755095, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2154936599638755095, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2154936599638755095, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 2154936599638755095, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 2154936599638755095, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 186.5 - objectReference: {fileID: 0} - - target: {fileID: 2154936599638755095, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -885 - objectReference: {fileID: 0} - target: {fileID: 2399706897051323529, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y @@ -4324,35 +4176,35 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -535 objectReference: {fileID: 0} - - target: {fileID: 2682353921060298752, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2579841837796578324, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 2682353921060298752, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2579841837796578324, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 2682353921060298752, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2579841837796578324, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.x value: 350 objectReference: {fileID: 0} - - target: {fileID: 2682353921060298752, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2579841837796578324, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y value: 350 objectReference: {fileID: 0} - - target: {fileID: 2682353921060298752, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2579841837796578324, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.x value: 536.5 objectReference: {fileID: 0} - - target: {fileID: 2682353921060298752, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2579841837796578324, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.y - value: -535 + value: -1235 objectReference: {fileID: 0} - target: {fileID: 2833023735704518191, guid: 99584e5b221414bc6801676403d15c80, type: 3} @@ -4384,92 +4236,62 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -885 objectReference: {fileID: 0} - - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2961805515600181331, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2961805515600181331, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2961805515600181331, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.x value: 350 objectReference: {fileID: 0} - - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2961805515600181331, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y value: 350 objectReference: {fileID: 0} - - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 186.5 - objectReference: {fileID: 0} - - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -885 - objectReference: {fileID: 0} - - target: {fileID: 4203109906240251758, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4203109906240251758, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4203109906240251758, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4203109906240251758, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4203109906240251758, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2961805515600181331, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.x value: 536.5 objectReference: {fileID: 0} - - target: {fileID: 4203109906240251758, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 2961805515600181331, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -1585 objectReference: {fileID: 0} - - target: {fileID: 4234061751731121999, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4234061751731121999, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4234061751731121999, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.x value: 350 objectReference: {fileID: 0} - - target: {fileID: 4234061751731121999, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y value: 350 objectReference: {fileID: 0} - - target: {fileID: 4234061751731121999, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.x value: 186.5 objectReference: {fileID: 0} - - target: {fileID: 4234061751731121999, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 4123500655849751100, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.y value: -885 @@ -4477,52 +4299,7 @@ PrefabInstance: - target: {fileID: 4298858863195123165, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y - value: 1410 - objectReference: {fileID: 0} - - target: {fileID: 4607058614580190438, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4607058614580190438, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4607058614580190438, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4607058614580190438, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4607058614580190438, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 186.5 - objectReference: {fileID: 0} - - target: {fileID: 4607058614580190438, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -535 - objectReference: {fileID: 0} - - target: {fileID: 4652826968656076956, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4652826968656076956, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4652826968656076956, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.41843975 + value: 1760 objectReference: {fileID: 0} - target: {fileID: 4811419117002763229, guid: 99584e5b221414bc6801676403d15c80, type: 3} @@ -4554,36 +4331,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -185 objectReference: {fileID: 0} - - target: {fileID: 4821300821974733070, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4821300821974733070, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4821300821974733070, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4821300821974733070, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4821300821974733070, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 186.5 - objectReference: {fileID: 0} - - target: {fileID: 4821300821974733070, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -1235 - objectReference: {fileID: 0} - target: {fileID: 5110718257854201774, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.x @@ -4629,6 +4376,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -885 objectReference: {fileID: 0} + - target: {fileID: 5776038874750826338, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5776038874750826338, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5776038874750826338, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_SizeDelta.x + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 5776038874750826338, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_SizeDelta.y + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 5776038874750826338, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 186.5 + objectReference: {fileID: 0} + - target: {fileID: 5776038874750826338, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -1585 + objectReference: {fileID: 0} - target: {fileID: 5805559125484193138, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y @@ -4689,40 +4466,35 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -185 objectReference: {fileID: 0} - - target: {fileID: 7046726055481360652, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 1410 - objectReference: {fileID: 0} - - target: {fileID: 7285518129967576334, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 6885845573931259995, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 7285518129967576334, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 6885845573931259995, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 7285518129967576334, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 6885845573931259995, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.x value: 350 objectReference: {fileID: 0} - - target: {fileID: 7285518129967576334, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 6885845573931259995, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_SizeDelta.y value: 350 objectReference: {fileID: 0} - - target: {fileID: 7285518129967576334, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 6885845573931259995, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.x value: 536.5 objectReference: {fileID: 0} - - target: {fileID: 7285518129967576334, guid: 99584e5b221414bc6801676403d15c80, + - target: {fileID: 6885845573931259995, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchoredPosition.y - value: -535 + value: -1585 objectReference: {fileID: 0} - target: {fileID: 7441032983035803716, guid: 99584e5b221414bc6801676403d15c80, type: 3} @@ -4754,36 +4526,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -535 objectReference: {fileID: 0} - - target: {fileID: 7707553270525277314, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7707553270525277314, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7707553270525277314, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 7707553270525277314, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 7707553270525277314, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 186.5 - objectReference: {fileID: 0} - - target: {fileID: 7707553270525277314, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -1235 - objectReference: {fileID: 0} - target: {fileID: 8265343813714484876, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.x @@ -4797,22 +4539,7 @@ PrefabInstance: - target: {fileID: 8265343813714484876, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMin.y - value: 0.41843975 - objectReference: {fileID: 0} - - target: {fileID: 8636479989803284642, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8636479989803284642, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8636479989803284642, guid: 99584e5b221414bc6801676403d15c80, - type: 3} - propertyPath: m_SizeDelta.x - value: -27 + value: 0.53409094 objectReference: {fileID: 0} - target: {fileID: 8867262365018385338, guid: 99584e5b221414bc6801676403d15c80, type: 3} @@ -4874,6 +4601,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -185 objectReference: {fileID: 0} + - target: {fileID: 9005560578837593300, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9005560578837593300, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9005560578837593300, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_SizeDelta.x + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 9005560578837593300, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_SizeDelta.y + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 9005560578837593300, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 536.5 + objectReference: {fileID: 0} + - target: {fileID: 9005560578837593300, guid: 99584e5b221414bc6801676403d15c80, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -1235 + objectReference: {fileID: 0} - target: {fileID: 9086346163277627670, guid: 99584e5b221414bc6801676403d15c80, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scripts/Logic/GameLogic.cs b/Assets/Scripts/Logic/GameLogic.cs index 360535e4..bd47bc35 100644 --- a/Assets/Scripts/Logic/GameLogic.cs +++ b/Assets/Scripts/Logic/GameLogic.cs @@ -107,7 +107,7 @@ public class GameLogic : MonoBehaviour { int tPosIndex = tPosIndexes[URandom.Range(0, tPosIndexes.Count)]; tPosIndexes.Remove(tPosIndex); - mEnemyBlockMgr.CreateBlock(tPosIndex, BlockType.Monster, URandom.Range(6, 11)); + mEnemyBlockMgr.CreateBlock(tPosIndex, BlockType.Monster, URandom.Range(3, 8)); } tPosIndexes = new List() { 5, 6, 7, 8, 9 }; tCount = URandom.Range(1, 5); @@ -115,7 +115,7 @@ public class GameLogic : MonoBehaviour { int tPosIndex = tPosIndexes[URandom.Range(0, tPosIndexes.Count)]; tPosIndexes.Remove(tPosIndex); - mEnemyBlockMgr.CreateBlock(tPosIndex, (BlockType)URandom.Range(0, 2), URandom.Range(7, 10)); + mEnemyBlockMgr.CreateBlock(tPosIndex, (BlockType)URandom.Range(0, 2), URandom.Range(4, 7)); } tPosIndexes = new List() { 10, 11, 12, 13, 14 }; tCount = URandom.Range(1, 5); @@ -123,7 +123,7 @@ public class GameLogic : MonoBehaviour { int tPosIndex = tPosIndexes[URandom.Range(0, tPosIndexes.Count)]; tPosIndexes.Remove(tPosIndex); - mEnemyBlockMgr.CreateBlock(tPosIndex, BlockType.Human, URandom.Range(7, 11)); + mEnemyBlockMgr.CreateBlock(tPosIndex, BlockType.Human, URandom.Range(3, 8)); } } diff --git a/Assets/TKGSDK/UnitySDK/Scripts/ADSScripts/ToukaSDKManager.cs b/Assets/TKGSDK/UnitySDK/Scripts/ADSScripts/ToukaSDKManager.cs index c73d97b2..32d7c688 100644 --- a/Assets/TKGSDK/UnitySDK/Scripts/ADSScripts/ToukaSDKManager.cs +++ b/Assets/TKGSDK/UnitySDK/Scripts/ADSScripts/ToukaSDKManager.cs @@ -37,8 +37,8 @@ namespace Touka public void PlayInterstitialAd(string adPos = "", Action callback = null, IVType _ivType = IVType.IV1) { #if NO_AD - callback(); - return; + callback?.Invoke(); + return; #endif // 判断是否达到可展示插屏的条件 if (!ToukaInterstitialTimer.Instance.CanShow(_ivType))