From c227fc2856de1ad23a1119a1f8b14af9e5be4a9d Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Wed, 14 May 2025 20:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=80=E5=86=85=E8=B7=B3=E8=BD=AC0514?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameDate/LevelDate/LevelState_1.asset | 178 ++++++---- .../Assets/Prefab/JumpInScence.meta | 8 + .../Prefab/JumpInScence/RoonButton.prefab | 225 +++++++++++++ .../JumpInScence/RoonButton.prefab.meta | 7 + .../Assets/Scenes/CampPoint.unity | 317 ++++++++++++++++-- .../Assets/Scenes/CardAddPoint.unity | 280 +++++++++++++++- .../Assets/Scenes/CardDeletePonit.unity | 279 ++++++++++++++- .../Assets/Scenes/Event.unity | 249 +++++++++++++- .../Assets/Scenes/ForgingPoint.unity | 251 +++++++++++++- .../Assets/Scenes/PotionPoint.unity | 280 +++++++++++++++- .../Assets/Scenes/ResourcePoint.unity | 299 ++++++++++++++++- .../Assets/Scenes/SampleScene.unity | 173 +++++++++- .../Assets/Scenes/Shop.unity | 272 ++++++++++++++- .../Assets/Scenes/StartMainScence.unity | 57 +++- .../Assets/Scenes/TreasurePoint.unity | 295 +++++++++++++++- .../Scripts/FightReward/RewardManager.cs | 3 +- .../Scripts/JumpInScenc/JumpInScenceNode.cs | 23 ++ .../JumpInScenc/JumpInScenceNode.cs.meta | 11 + .../Scripts/JumpInScenc/JumpInSceneManager.cs | 119 ++++++- .../Scripts/JumpInScenc/RegistJumpInScence.cs | 15 + .../JumpInScenc/RegistJumpInScence.cs.meta | 11 + .../JumpInScenc/RegisteJumpInScenceCamera.cs | 26 ++ .../RegisteJumpInScenceCamera.cs.meta | 11 + .../Scripts/LeveProcess/LeveGeneraterNew.cs | 14 +- .../Assets/Scripts/LeveProcess/LevelNode.cs | 1 + .../Scripts/RewardCardPoint/CardAddManager.cs | 4 +- .../Scripts/RewardCardPoint/CardAddNode.cs | 3 +- .../Tool/Data_SO/LevelDevelopData_SO.cs | 2 +- .../Assets/Scripts/manager/EventManager.cs | 3 +- .../Scripts/manager/ScenceLoadManager.cs | 5 +- 30 files changed, 3187 insertions(+), 234 deletions(-) create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset index ba056d9d..356406c5 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset @@ -12,9 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3} m_Name: LevelState_1 m_EditorClassIdentifier: - levelStep: 1 + levelStep: 5 mapLevel: 1 - currentPoint: {x: 1, y: 1} + currentPoint: {x: 4, y: 0} levelSaveMap: - levelDataList: - roomType: 13 @@ -24,6 +24,7 @@ MonoBehaviour: nodePos: {x: -8.1901, y: 0.05970478, z: -7.539102} line: 0 column: 0 + roomDestinationIndex: 16 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -39,6 +40,7 @@ MonoBehaviour: nodePos: {x: -8.190107, y: 0.059706688, z: -6.4391036} line: 0 column: 1 + roomDestinationIndex: 16 fatherLevelNodes: [] nextLevelNodes: - {x: 1, y: 1} @@ -55,6 +57,7 @@ MonoBehaviour: nodePos: {x: -8.190113, y: 0.059708595, z: -5.339105} line: 0 column: 2 + roomDestinationIndex: 16 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -71,12 +74,14 @@ MonoBehaviour: nodePos: {x: -5.99012, y: 0.05971241, z: -7.539103} line: 1 column: 0 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: weak enemyList: - - 4007 - - 4008 + - 4003 + - 4003 + - 4004 extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -84,10 +89,11 @@ MonoBehaviour: - roomType: 0 roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 - passBy: 0 + passBy: 1 nodePos: {x: -5.9901237, y: 0.059714317, z: -6.4391055} line: 1 column: 1 + roomDestinationIndex: 2 fatherLevelNodes: - {x: 0, y: 1} nextLevelNodes: @@ -96,9 +102,8 @@ MonoBehaviour: - {x: 2, y: 2} fightEenemyPool: weak enemyList: - - 4003 - - 4003 - - 4004 + - 4007 + - 4008 extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -110,25 +115,27 @@ MonoBehaviour: nodePos: {x: -5.9901257, y: 0.059716225, z: -5.339107} line: 1 column: 2 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: weak enemyList: - - 4007 - - 4008 - - 4008 + - 4003 + - 4003 + - 4004 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 9 - roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} + - roomType: 11 + roomSprite: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} isUse: 1 - passBy: 0 + passBy: 1 nodePos: {x: -3.7901325, y: 0.05972004, z: -7.539102} line: 2 column: 0 + roomDestinationIndex: 13 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -139,13 +146,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 12 - roomSprite: {fileID: 21300000, guid: 99d6cfcd8d628454989abc09534f0b64, type: 3} + - roomType: 4 + roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: -3.7901382, y: 0.059721947, z: -6.4391065} line: 2 column: 1 + roomDestinationIndex: 4 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -156,13 +164,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 11 - roomSprite: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} + - roomType: 6 + roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: -3.7901402, y: 0.059723854, z: -5.339107} line: 2 column: 2 + roomDestinationIndex: 3 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -177,10 +186,11 @@ MonoBehaviour: - roomType: 0 roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 - passBy: 0 + passBy: 1 nodePos: {x: -1.5901484, y: 0.05972767, z: -7.539104} line: 3 column: 0 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 4, y: 0} @@ -200,13 +210,15 @@ MonoBehaviour: nodePos: {x: -1.5901523, y: 0.059729576, z: -6.4391055} line: 3 column: 1 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 4, y: 1} fightEenemyPool: weak enemyList: - - 4007 - - 4008 + - 4003 + - 4003 + - 4004 extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -218,6 +230,7 @@ MonoBehaviour: nodePos: {x: -1.5901561, y: 0.059731483, z: -5.339107} line: 3 column: 2 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 4, y: 2} @@ -225,18 +238,20 @@ MonoBehaviour: enemyList: - 4007 - 4008 + - 4008 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 6 - roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} isUse: 1 - passBy: 0 + passBy: 1 nodePos: {x: 0.6098423, y: 0.0597353, z: -7.539102} line: 4 column: 0 + roomDestinationIndex: 9 fatherLevelNodes: - {x: 3, y: 0} nextLevelNodes: @@ -247,13 +262,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 4 - roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 10 + roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} isUse: 1 passBy: 0 nodePos: {x: 0.6098404, y: 0.059737206, z: -6.4391055} line: 4 column: 1 + roomDestinationIndex: 11 fatherLevelNodes: - {x: 3, y: 1} nextLevelNodes: @@ -264,13 +280,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 9 - roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} + - roomType: 10 + roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} isUse: 1 passBy: 0 nodePos: {x: 0.60983753, y: 0.059739113, z: -5.339106} line: 4 column: 2 + roomDestinationIndex: 11 fatherLevelNodes: - {x: 3, y: 2} nextLevelNodes: @@ -289,6 +306,7 @@ MonoBehaviour: nodePos: {x: 2.809836, y: 0.059742928, z: -7.539102} line: 5 column: 0 + roomDestinationIndex: 10 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -304,6 +322,7 @@ MonoBehaviour: nodePos: {x: 2.8098352, y: 0.059744835, z: -6.4391036} line: 5 column: 1 + roomDestinationIndex: 10 fatherLevelNodes: - {x: 4, y: 0} - {x: 4, y: 1} @@ -323,6 +342,7 @@ MonoBehaviour: nodePos: {x: 2.8098352, y: 0.059746742, z: -5.339105} line: 5 column: 2 + roomDestinationIndex: 10 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -339,6 +359,7 @@ MonoBehaviour: nodePos: {x: 5.0098357, y: 0.059750557, z: -7.5391} line: 6 column: 0 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: strong @@ -356,6 +377,7 @@ MonoBehaviour: nodePos: {x: 5.0098357, y: 0.059752464, z: -6.4391055} line: 6 column: 1 + roomDestinationIndex: 2 fatherLevelNodes: - {x: 5, y: 1} nextLevelNodes: @@ -370,31 +392,36 @@ MonoBehaviour: mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 2 + roomSprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} isUse: 0 passBy: 0 nodePos: {x: 5.0098357, y: 0.05975437, z: -5.339107} line: 6 column: 2 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] - fightEenemyPool: strong + fightEenemyPool: eliteAndMonster enemyList: - - 4017 - - 4018 - extraEnemyList: [] + - 4005 + - 4006 + extraEnemyList: + - 4007 + - 4008 + - 4008 mapIndex: 100001 - extraMapIndex: + extraMapIndex: 100001 isExtra: 0 - levelDataList: - - roomType: 6 - roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 12 + roomSprite: {fileID: 21300000, guid: 99d6cfcd8d628454989abc09534f0b64, type: 3} isUse: 1 passBy: 0 nodePos: {x: 7.2098393, y: 0.059758186, z: -7.539102} line: 7 column: 0 + roomDestinationIndex: 15 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -405,13 +432,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 10 - roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} + - roomType: 4 + roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 7.20984, y: 0.059760094, z: -6.4391065} line: 7 column: 1 + roomDestinationIndex: 4 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -422,13 +450,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + - roomType: 9 + roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} isUse: 1 passBy: 0 nodePos: {x: 7.2098417, y: 0.059762, z: -5.339107} line: 7 column: 2 + roomDestinationIndex: 12 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -447,6 +476,7 @@ MonoBehaviour: nodePos: {x: 9.409845, y: 0.059765816, z: -7.539104} line: 8 column: 0 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 9, y: 0} @@ -458,50 +488,53 @@ MonoBehaviour: mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 1 - roomSprite: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.409847, y: 0.059767723, z: -6.4391055} line: 8 column: 1 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 9, y: 1} - fightEenemyPool: elite + fightEenemyPool: strong enemyList: - - 4005 - - 4006 + - 4017 + - 4018 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 1 + roomSprite: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.409851, y: 0.05976963, z: -5.339107} line: 8 column: 2 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 9, y: 2} - fightEenemyPool: strong + fightEenemyPool: elite enemyList: - - 4017 - - 4018 + - 4005 + - 4006 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + - roomType: 9 + roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} isUse: 1 passBy: 0 nodePos: {x: 11.609858, y: 0.059773445, z: -7.539102} line: 9 column: 0 + roomDestinationIndex: 12 fatherLevelNodes: - {x: 8, y: 0} nextLevelNodes: @@ -512,13 +545,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 4 - roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 11 + roomSprite: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} isUse: 1 passBy: 0 nodePos: {x: 11.609861, y: 0.059775352, z: -6.4391055} line: 9 column: 1 + roomDestinationIndex: 13 fatherLevelNodes: - {x: 8, y: 1} nextLevelNodes: @@ -529,13 +563,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 10 - roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} + - roomType: 12 + roomSprite: {fileID: 21300000, guid: 99d6cfcd8d628454989abc09534f0b64, type: 3} isUse: 1 passBy: 0 nodePos: {x: 11.609866, y: 0.05977726, z: -5.339106} line: 9 column: 2 + roomDestinationIndex: 15 fatherLevelNodes: - {x: 8, y: 2} nextLevelNodes: @@ -554,6 +589,7 @@ MonoBehaviour: nodePos: {x: 13.809872, y: 0.059781075, z: -7.539102} line: 10 column: 0 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: strong @@ -564,29 +600,27 @@ MonoBehaviour: mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 2 - roomSprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} + - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 13.8098755, y: 0.059782982, z: -6.4391055} line: 10 column: 1 + roomDestinationIndex: 2 fatherLevelNodes: - {x: 9, y: 0} - {x: 9, y: 1} - {x: 9, y: 2} nextLevelNodes: - {x: 11, y: 1} - fightEenemyPool: eliteAndMonster + fightEenemyPool: strong enemyList: - - 4005 - - 4006 - extraEnemyList: - - 4003 - - 4003 - - 4004 + - 4017 + - 4018 + extraEnemyList: [] mapIndex: 100001 - extraMapIndex: 100001 + extraMapIndex: isExtra: 0 - roomType: 0 roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} @@ -595,6 +629,7 @@ MonoBehaviour: nodePos: {x: 13.809877, y: 0.05978489, z: -5.339107} line: 10 column: 2 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: strong @@ -613,6 +648,7 @@ MonoBehaviour: nodePos: {x: 16.009886, y: 0.059788704, z: -7.539103} line: 11 column: 0 + roomDestinationIndex: 9 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -628,6 +664,7 @@ MonoBehaviour: nodePos: {x: 16.009893, y: 0.05979061, z: -6.4391065} line: 11 column: 1 + roomDestinationIndex: 9 fatherLevelNodes: - {x: 10, y: 1} nextLevelNodes: @@ -645,6 +682,7 @@ MonoBehaviour: nodePos: {x: 16.009895, y: 0.05979252, z: -5.339108} line: 11 column: 2 + roomDestinationIndex: 9 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -661,6 +699,7 @@ MonoBehaviour: nodePos: {x: 18.209911, y: 0.059796333, z: -7.539104} line: 12 column: 0 + roomDestinationIndex: 14 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -676,6 +715,7 @@ MonoBehaviour: nodePos: {x: 18.20992, y: 0.05979824, z: -6.4391065} line: 12 column: 1 + roomDestinationIndex: 14 fatherLevelNodes: - {x: 11, y: 1} nextLevelNodes: @@ -693,6 +733,7 @@ MonoBehaviour: nodePos: {x: 18.209927, y: 0.059800148, z: -5.339107} line: 12 column: 2 + roomDestinationIndex: 14 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: @@ -709,6 +750,7 @@ MonoBehaviour: nodePos: {x: 20.409945, y: 0.059803963, z: -7.039104} line: 13 column: 0 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: Boss @@ -724,6 +766,7 @@ MonoBehaviour: nodePos: {x: 20.409952, y: 0.05980587, z: -5.9391055} line: 13 column: 1 + roomDestinationIndex: 2 fatherLevelNodes: - {x: 12, y: 1} nextLevelNodes: [] @@ -740,6 +783,7 @@ MonoBehaviour: nodePos: {x: 20.40996, y: 0.059807777, z: -4.839107} line: 13 column: 2 + roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: Boss diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence.meta new file mode 100644 index 00000000..ed3c84ec --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51bca40c063e7524bbd3e9f1557c4217 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab new file mode 100644 index 00000000..1a258d8a --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &247809467470846845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4922460355638854559} + - component: {fileID: 8545311387292313906} + - component: {fileID: 4792008729271108024} + - component: {fileID: 7906898108373507761} + - component: {fileID: 4263571062841177097} + m_Layer: 5 + m_Name: RoonButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4922460355638854559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247809467470846845} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6236118399234883682} + m_Father: {fileID: 0} + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8545311387292313906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247809467470846845} + m_CullTransparentMesh: 1 +--- !u!114 &4792008729271108024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247809467470846845} + 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: 0.6862745} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &7906898108373507761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247809467470846845} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7029177008660300860} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4263571062841177097} + m_TargetAssemblyTypeName: JumpInScenceNode, Assembly-CSharp + m_MethodName: JumpToDestination + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &4263571062841177097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247809467470846845} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f84a6e69e1c4f041be111bbf02dd89e, type: 3} + m_Name: + m_EditorClassIdentifier: + image: {fileID: 7029177008660300860} + jumpDestination: 0 +--- !u!1 &3008061606126141220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6236118399234883682} + - component: {fileID: 1445047933348937802} + - component: {fileID: 7029177008660300860} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6236118399234883682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3008061606126141220} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00003451209} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4922460355638854559} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1445047933348937802 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3008061606126141220} + m_CullTransparentMesh: 1 +--- !u!114 &7029177008660300860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3008061606126141220} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab.meta new file mode 100644 index 00000000..1bbca04a --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/JumpInScence/RoonButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fb7dc5aa7bd9d641b6e7111d340a3e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/CampPoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/CampPoint.unity index 077dc165..58067f4d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/CampPoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/CampPoint.unity @@ -528,8 +528,8 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -538,6 +538,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &28085393 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3687,8 +3699,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3697,6 +3709,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &295558191 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4075,8 +4099,8 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -4085,6 +4109,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &310364219 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6743,8 +6779,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -6753,6 +6789,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &487180589 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7840,7 +7888,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7fdb8517729ce2b42b8193e7b887c770, type: 3} m_Name: m_EditorClassIdentifier: - gameObject: {fileID: 1463029924} + gameObjectUI: {fileID: 0} --- !u!114 &570399559 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7899,8 +7947,8 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -14143,7 +14191,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1082158929 Canvas: m_ObjectHideFlags: 0 @@ -14153,7 +14201,7 @@ Canvas: m_GameObject: {fileID: 1082158926} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1897423685} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -14174,9 +14222,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082158926} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.399999} + m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 720835718} @@ -14185,9 +14233,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 30, y: -4.920001} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1082425749 GameObject: m_ObjectHideFlags: 0 @@ -15931,6 +15979,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1227682011} m_CullTransparentMesh: 1 +--- !u!1 &1232045533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1232045537} + - component: {fileID: 1232045536} + - component: {fileID: 1232045535} + - component: {fileID: 1232045534} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1232045534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232045533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1232045535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232045533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1232045536 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232045533} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1897423685} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1232045537 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232045533} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2020665859} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &1234122540 GameObject: m_ObjectHideFlags: 0 @@ -23447,6 +23597,7 @@ GameObject: - component: {fileID: 1897423685} - component: {fileID: 1897423684} - component: {fileID: 1897423687} + - component: {fileID: 1897423688} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -23572,6 +23723,20 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &1897423688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897423683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 30, y: 5.08, z: 6} + isAngle: 0 --- !u!1 &1927267599 GameObject: m_ObjectHideFlags: 0 @@ -24668,6 +24833,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2012240763} m_CullTransparentMesh: 1 +--- !u!1 &2020665858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2020665859} + - component: {fileID: 2020665863} + - component: {fileID: 2020665862} + - component: {fileID: 2020665861} + - component: {fileID: 2020665860} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2020665859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020665858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1232045537} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &2020665860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020665858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2020665861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020665858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &2020665862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020665858} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2020665863 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020665858} + m_CullTransparentMesh: 1 --- !u!1 &2024631616 GameObject: m_ObjectHideFlags: 0 @@ -25629,3 +25907,4 @@ SceneRoots: - {fileID: 1012544606} - {fileID: 391309334} - {fileID: 953786041} + - {fileID: 1232045537} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/CardAddPoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/CardAddPoint.unity index 9829e934..7e1a460f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/CardAddPoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/CardAddPoint.unity @@ -776,6 +776,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 72310710} m_CullTransparentMesh: 1 +--- !u!1 &76393323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 76393327} + - component: {fileID: 76393326} + - component: {fileID: 76393325} + - component: {fileID: 76393324} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &76393324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76393323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &76393325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76393323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &76393326 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76393323} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1897423685} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &76393327 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76393323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 687893681} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &83076105 GameObject: m_ObjectHideFlags: 0 @@ -3538,8 +3640,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3548,6 +3650,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &295558191 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6449,8 +6563,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -6459,6 +6573,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &487180589 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8731,6 +8857,119 @@ Transform: m_Children: [] m_Father: {fileID: 518822761} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &687893680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 687893681} + - component: {fileID: 687893685} + - component: {fileID: 687893684} + - component: {fileID: 687893683} + - component: {fileID: 687893682} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &687893681 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687893680} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 76393327} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &687893682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687893680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &687893683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687893680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &687893684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687893680} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &687893685 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687893680} + m_CullTransparentMesh: 1 --- !u!1 &692170083 GameObject: m_ObjectHideFlags: 0 @@ -12371,6 +12610,7 @@ MonoBehaviour: - {fileID: 205558359} - {fileID: 1055150654} - {fileID: 1922884915} + cardPanel: {fileID: 1575263866} --- !u!1 &1012544604 GameObject: m_ObjectHideFlags: 0 @@ -13477,7 +13717,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1082158929 Canvas: m_ObjectHideFlags: 0 @@ -13487,7 +13727,7 @@ Canvas: m_GameObject: {fileID: 1082158926} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1897423685} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -13508,9 +13748,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082158926} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.399999} + m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 720835718} @@ -13519,9 +13759,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 30, y: -4.920001} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1082425749 GameObject: m_ObjectHideFlags: 0 @@ -22546,6 +22786,7 @@ GameObject: - component: {fileID: 1897423685} - component: {fileID: 1897423684} - component: {fileID: 1897423687} + - component: {fileID: 1897423688} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -22671,6 +22912,20 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &1897423688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897423683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 30, y: 5.08, z: 6} + isAngle: 0 --- !u!1 &1922884914 GameObject: m_ObjectHideFlags: 0 @@ -24827,3 +25082,4 @@ SceneRoots: - {fileID: 1012544606} - {fileID: 985674836} - {fileID: 391309334} + - {fileID: 76393327} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/CardDeletePonit.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/CardDeletePonit.unity index da5c7b77..538fabf1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/CardDeletePonit.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/CardDeletePonit.unity @@ -18840,9 +18840,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1386412409} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: -1.0940988} + m_LocalScale: {x: 0.008635327, y: 0.008635327, z: 0.008635327} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 640071701} @@ -18852,9 +18852,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 90, y: 180, 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.19999981, y: 2.6202993} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1386412411 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18894,7 +18894,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1386412413 Canvas: m_ObjectHideFlags: 0 @@ -18904,7 +18904,7 @@ Canvas: m_GameObject: {fileID: 1386412409} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1851502883} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -20299,8 +20299,8 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 101933366} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -20964,6 +20964,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1569860825} m_CullTransparentMesh: 1 +--- !u!1 &1573656204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1573656205} + - component: {fileID: 1573656209} + - component: {fileID: 1573656208} + - component: {fileID: 1573656207} + - component: {fileID: 1573656206} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1573656205 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573656204} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2040998678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1573656206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573656204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1573656207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573656204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &1573656208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573656204} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1573656209 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573656204} + m_CullTransparentMesh: 1 --- !u!1 &1582230129 GameObject: m_ObjectHideFlags: 0 @@ -21577,6 +21690,7 @@ GameObject: m_Component: - component: {fileID: 1614591061} - component: {fileID: 1614591060} + - component: {fileID: 1614591062} m_Layer: 0 m_Name: Virtual Camera m_TagString: Untagged @@ -21639,6 +21753,20 @@ Transform: - {fileID: 535142248} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &1614591062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614591059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 5.2, y: 10.8, z: 6} + isAngle: 0 --- !u!1 &1651024932 GameObject: m_ObjectHideFlags: 0 @@ -25841,8 +25969,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 101933366} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -25851,6 +25979,30 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1064378230} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1931305150} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1989837798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -26598,6 +26750,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036891063} m_CullTransparentMesh: 1 +--- !u!1 &2040998674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2040998678} + - component: {fileID: 2040998677} + - component: {fileID: 2040998676} + - component: {fileID: 2040998675} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2040998675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040998674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2040998676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040998674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &2040998677 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040998674} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1851502883} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2040998678 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040998674} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1573656205} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &2056575893 GameObject: m_ObjectHideFlags: 0 @@ -28470,3 +28724,4 @@ SceneRoots: - {fileID: 2102594628} - {fileID: 1740960822} - {fileID: 307263762} + - {fileID: 2040998678} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity index 5d54e65f..df322c52 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity @@ -6031,8 +6031,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 711850069} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -17064,7 +17064,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1347753946 Canvas: m_ObjectHideFlags: 0 @@ -17074,7 +17074,7 @@ Canvas: m_GameObject: {fileID: 1347753943} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1786106964} m_PlaneDistance: 7 m_PixelPerfect: 0 @@ -17096,8 +17096,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1347753943} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -3} + m_LocalScale: {x: 0.00748417, y: 0.00748417, z: 0.00748417} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 90910809} @@ -17111,9 +17111,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1356428853 GameObject: m_ObjectHideFlags: 0 @@ -22935,6 +22935,7 @@ GameObject: - component: {fileID: 1786106964} - component: {fileID: 1786106963} - component: {fileID: 1786106966} + - component: {fileID: 1786106967} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -23060,6 +23061,20 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &1786106967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1786106962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 0, y: 3, z: -10} + isAngle: 0 --- !u!1 &1788547179 GameObject: m_ObjectHideFlags: 0 @@ -23922,6 +23937,221 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873735720} m_CullTransparentMesh: 1 +--- !u!1 &1885051203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1885051207} + - component: {fileID: 1885051206} + - component: {fileID: 1885051205} + - component: {fileID: 1885051204} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1885051204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885051203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1885051205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885051203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1885051206 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885051203} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1786106964} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1885051207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885051203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1900537130} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} +--- !u!1 &1900537129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1900537130} + - component: {fileID: 1900537134} + - component: {fileID: 1900537133} + - component: {fileID: 1900537132} + - component: {fileID: 1900537131} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1900537130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900537129} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1885051207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1900537131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900537129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1900537132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900537129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &1900537133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900537129} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1900537134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900537129} + m_CullTransparentMesh: 1 --- !u!1 &1904377950 GameObject: m_ObjectHideFlags: 0 @@ -27286,3 +27516,4 @@ SceneRoots: - {fileID: 1641991462} - {fileID: 2130507677} - {fileID: 509371571} + - {fileID: 1885051207} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity index cff73520..9c4b1160 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity @@ -15409,7 +15409,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1050309817 Canvas: m_ObjectHideFlags: 0 @@ -15419,7 +15419,7 @@ Canvas: m_GameObject: {fileID: 1050309814} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1897423685} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -15440,9 +15440,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1050309814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.399999} + m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 144080779} @@ -15450,9 +15450,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 30, y: -4.920001} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1052363366 GameObject: m_ObjectHideFlags: 0 @@ -21311,6 +21311,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1404878762} m_CullTransparentMesh: 1 +--- !u!1 &1414508673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1414508677} + - component: {fileID: 1414508676} + - component: {fileID: 1414508675} + - component: {fileID: 1414508674} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1414508674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1414508673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1414508675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1414508673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1414508676 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1414508673} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1897423685} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1414508677 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1414508673} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1951818535} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &1415934097 GameObject: m_ObjectHideFlags: 0 @@ -22868,8 +22970,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -27593,6 +27695,7 @@ GameObject: - component: {fileID: 1897423684} - component: {fileID: 1897423687} - component: {fileID: 1897423688} + - component: {fileID: 1897423689} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -27739,6 +27842,20 @@ MonoBehaviour: yMaxMove: 5 yMinMove: -5 moveSpeed: 15 +--- !u!114 &1897423689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897423683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 30, y: 5.08, z: 6} + isAngle: 0 --- !u!1 &1917240222 GameObject: m_ObjectHideFlags: 0 @@ -28130,6 +28247,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950253016} m_CullTransparentMesh: 1 +--- !u!1 &1951818534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1951818535} + - component: {fileID: 1951818539} + - component: {fileID: 1951818538} + - component: {fileID: 1951818537} + - component: {fileID: 1951818536} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1951818535 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951818534} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1414508677} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1951818536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951818534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1951818537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951818534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &1951818538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951818534} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1951818539 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951818534} + m_CullTransparentMesh: 1 --- !u!1 &1954456839 GameObject: m_ObjectHideFlags: 0 @@ -30461,3 +30691,4 @@ SceneRoots: - {fileID: 1068848972} - {fileID: 1989769048} - {fileID: 3750202908471173204} + - {fileID: 1414508677} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/PotionPoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/PotionPoint.unity index a40b41a2..e699610b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/PotionPoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/PotionPoint.unity @@ -2321,6 +2321,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 200198651} m_CullTransparentMesh: 1 +--- !u!1 &205856194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 205856195} + - component: {fileID: 205856199} + - component: {fileID: 205856198} + - component: {fileID: 205856197} + - component: {fileID: 205856196} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &205856195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205856194} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2072227002} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &205856196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205856194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &205856197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205856194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &205856198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205856194} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &205856199 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205856194} + m_CullTransparentMesh: 1 --- !u!1 &212167745 GameObject: m_ObjectHideFlags: 0 @@ -3538,8 +3651,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3548,6 +3661,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &295558191 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6528,8 +6653,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -6538,6 +6663,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &487180589 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11057,7 +11194,6 @@ MonoBehaviour: type: 3} legacyFather: {fileID: 2029886105} relicClassNameList: [] - legacyNodesList: [] --- !u!4 &886162958 Transform: m_ObjectHideFlags: 0 @@ -13663,7 +13799,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1082158929 Canvas: m_ObjectHideFlags: 0 @@ -13673,7 +13809,7 @@ Canvas: m_GameObject: {fileID: 1082158926} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1897423685} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -13694,9 +13830,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082158926} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.399999} + m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 720835718} @@ -13705,9 +13841,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 30, y: -4.920001} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1082425749 GameObject: m_ObjectHideFlags: 0 @@ -22734,6 +22870,7 @@ GameObject: - component: {fileID: 1897423685} - component: {fileID: 1897423684} - component: {fileID: 1897423687} + - component: {fileID: 1897423688} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -22859,6 +22996,20 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &1897423688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897423683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 30, y: 5.08, z: 6} + isAngle: 0 --- !u!1 &1927267599 GameObject: m_ObjectHideFlags: 0 @@ -24626,6 +24777,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2070635978} m_CullTransparentMesh: 1 +--- !u!1 &2072226998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2072227002} + - component: {fileID: 2072227001} + - component: {fileID: 2072227000} + - component: {fileID: 2072226999} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2072226999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072226998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2072227000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072226998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &2072227001 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072226998} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1897423685} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2072227002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072226998} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 205856195} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &2092640664 GameObject: m_ObjectHideFlags: 0 @@ -24970,3 +25223,4 @@ SceneRoots: - {fileID: 2029886106} - {fileID: 391309334} - {fileID: 499040520} + - {fileID: 2072227002} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ResourcePoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ResourcePoint.unity index b6bb302a..cc638e63 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ResourcePoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ResourcePoint.unity @@ -526,10 +526,22 @@ MonoBehaviour: m_StringArgument: 30 m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3608,8 +3620,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3994,10 +4006,22 @@ MonoBehaviour: m_StringArgument: 30 m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -6664,8 +6688,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -6674,6 +6698,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &487180589 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11148,6 +11184,119 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &898452858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 898452859} + - component: {fileID: 898452863} + - component: {fileID: 898452862} + - component: {fileID: 898452861} + - component: {fileID: 898452860} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &898452859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898452858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1812410586} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &898452860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898452858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &898452861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898452858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &898452862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898452858} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &898452863 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898452858} + m_CullTransparentMesh: 1 --- !u!1 &909459613 GameObject: m_ObjectHideFlags: 0 @@ -13614,7 +13763,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1082158929 Canvas: m_ObjectHideFlags: 0 @@ -13624,7 +13773,7 @@ Canvas: m_GameObject: {fileID: 1082158926} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1897423685} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -13645,9 +13794,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082158926} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.399999} + m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 720835718} @@ -13656,9 +13805,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 30, y: -4.920001} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1082425749 GameObject: m_ObjectHideFlags: 0 @@ -22277,6 +22426,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1802303238} m_CullTransparentMesh: 1 +--- !u!1 &1812410582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1812410586} + - component: {fileID: 1812410585} + - component: {fileID: 1812410584} + - component: {fileID: 1812410583} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1812410583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812410582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1812410584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812410582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1812410585 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812410582} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1897423685} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1812410586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812410582} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 898452859} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &1814081266 GameObject: m_ObjectHideFlags: 0 @@ -22763,6 +23014,7 @@ GameObject: - component: {fileID: 1897423685} - component: {fileID: 1897423684} - component: {fileID: 1897423687} + - component: {fileID: 1897423688} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -22888,6 +23140,20 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &1897423688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897423683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 30, y: 5.08, z: 6} + isAngle: 0 --- !u!1 &1927267599 GameObject: m_ObjectHideFlags: 0 @@ -24945,3 +25211,4 @@ SceneRoots: - {fileID: 1012544606} - {fileID: 391309334} - {fileID: 953786041} + - {fileID: 1812410586} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index c21d1ba0..7657b33d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -22894,6 +22894,7 @@ GameObject: - component: {fileID: 699857787} - component: {fileID: 699857789} - component: {fileID: 699857790} + - component: {fileID: 699857791} m_Layer: 0 m_Name: Virtual CameraClose m_TagString: Untagged @@ -23016,6 +23017,20 @@ MonoBehaviour: m_FrequencyGain: 1 m_Duration: 1 m_NoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!114 &699857791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 699857786} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 54, y: 0, z: 0} + isAngle: 1 --- !u!1 &703194056 GameObject: m_ObjectHideFlags: 0 @@ -26926,6 +26941,7 @@ RectTransform: - {fileID: 637486498} - {fileID: 197216736} - {fileID: 639366020} + - {fileID: 1449930830} m_Father: {fileID: 1915587657} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -39754,6 +39770,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1442274114} m_CullTransparentMesh: 1 +--- !u!1 &1449930829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1449930830} + - component: {fileID: 1449930833} + - component: {fileID: 1449930832} + - component: {fileID: 1449930834} + - component: {fileID: 1449930831} + m_Layer: 5 + m_Name: JumpInScence + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1449930830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449930829} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 846544929} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 800, y: 200} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1449930831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449930829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &1449930832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449930829} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1449930833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449930829} + m_CullTransparentMesh: 1 +--- !u!114 &1449930834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449930829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1457874388 GameObject: m_ObjectHideFlags: 0 @@ -56443,14 +56572,26 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: + - m_Target: {fileID: 767496036} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 - m_Target: {fileID: 13807178} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 1 + m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -57603,21 +57744,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8bfdec5ed77d820469d77443cfb386a8, type: 3} m_Name: m_EditorClassIdentifier: - desIconFather: {fileID: 0} - monsterIcon: {fileID: 0} - eliteMonsterIcon: {fileID: 0} - eliteAndMonsterIcon: {fileID: 0} - bossIcon: {fileID: 0} - shopIcon: {fileID: 0} - campfireIcon: {fileID: 0} - incidentIcon: {fileID: 0} - treasureIcon: {fileID: 0} - forgingIcon: {fileID: 0} - deleteCardIcon: {fileID: 0} - addCardIcon: {fileID: 0} - resourceIcon: {fileID: 0} - potionIcon: {fileID: 0} - startIcon: {fileID: 0} + cameraTrans: {fileID: 699857788} + cameraSpeed: 0.8 + endAngle: {x: 54, y: 0, z: 0} + endPos: {x: 0, y: 0, z: 0} + isAngle: 1 + desRoomFather: {fileID: 1449930830} + roomPrefab: {fileID: 247809467470846845, guid: 1fb7dc5aa7bd9d641b6e7111d340a3e2, + type: 3} + mapIcon: {fileID: 21300000, guid: 48d1ff5b2e327784cb1ad45c2d4a6adf, type: 3} + monsterIcon: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + elitIcon: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} --- !u!4 &1968320911 Transform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity index a4c24d3b..5ee53d58 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity @@ -6150,6 +6150,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 345154688} m_CullTransparentMesh: 1 +--- !u!1 &350170563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 350170564} + - component: {fileID: 350170568} + - component: {fileID: 350170567} + - component: {fileID: 350170566} + - component: {fileID: 350170565} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &350170564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350170563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1136318134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &350170565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350170563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &350170566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350170563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &350170567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350170563} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &350170568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350170563} + m_CullTransparentMesh: 1 --- !u!1 &350349192 GameObject: m_ObjectHideFlags: 0 @@ -9291,7 +9404,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000045776367, y: 29.9975} + m_AnchoredPosition: {x: 0.000045776367, y: 29.997498} m_SizeDelta: {x: -0.000091552734, y: -60.005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &609715213 @@ -15605,6 +15718,7 @@ Transform: - {fileID: 1064378231} - {fileID: 1921645787} - {fileID: 1931305151} + - {fileID: 1136318134} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1027598461 @@ -17264,6 +17378,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132017285} m_CullTransparentMesh: 1 +--- !u!1 &1136318133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1136318134} + - component: {fileID: 1136318137} + - component: {fileID: 1136318136} + - component: {fileID: 1136318135} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1136318134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136318133} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 350170564} + m_Father: {fileID: 1020082260} + 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_Pivot: {x: 0, y: 0} +--- !u!114 &1136318135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136318133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1136318136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136318133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1136318137 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136318133} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1851502883} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1145283435 GameObject: m_ObjectHideFlags: 0 @@ -22593,9 +22809,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1386412409} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: -1.0940988} + m_LocalScale: {x: 0.008635327, y: 0.008635327, z: 0.008635327} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1102146906} @@ -22605,9 +22821,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 90, y: 180, 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.19999981, y: 2.6202993} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1386412411 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22647,7 +22863,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1386412413 Canvas: m_ObjectHideFlags: 0 @@ -22657,7 +22873,7 @@ Canvas: m_GameObject: {fileID: 1386412409} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1851502883} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -23894,7 +24110,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000045776367, y: 29.9975} + m_AnchoredPosition: {x: 0.000045776367, y: 29.997498} m_SizeDelta: {x: -0.000091552734, y: -60.005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1485279164 @@ -26294,6 +26510,7 @@ GameObject: m_Component: - component: {fileID: 1614591061} - component: {fileID: 1614591060} + - component: {fileID: 1614591062} m_Layer: 0 m_Name: Virtual Camera m_TagString: Untagged @@ -26356,6 +26573,20 @@ Transform: - {fileID: 535142248} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &1614591062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614591059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 5.2, y: 10.8, z: 6} + isAngle: 0 --- !u!1 &1617653670 GameObject: m_ObjectHideFlags: 0 @@ -32132,8 +32363,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 101933366} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -33935,7 +34166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000045776367, y: 29.9975} + m_AnchoredPosition: {x: 0.000045776367, y: 29.997498} m_SizeDelta: {x: -0.000091552734, y: -60.005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2089049455 @@ -35020,7 +35251,6 @@ MonoBehaviour: ainPanle: {fileID: 659670789435380440} currentNode: {fileID: 0} dragState: 3 - ready: 0 castingPool: [] layerMask: serializedVersion: 2 @@ -36242,7 +36472,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: cardId: 0 - cost: {fileID: 7602207925095501962} + cost: {fileID: 0} cardIndex: 0 cardDescription: {fileID: 0} cardName: {fileID: 0} @@ -36257,7 +36487,7 @@ MonoBehaviour: fun1Val: {fileID: 5204618098417416137} fun2Val: {fileID: 534906922457473645} fun3Val: {fileID: 8606927767695806529} - cardBulletPrefab: {fileID: 0} + cardBulletFatherPrefab: {fileID: 0} smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} noSmallCard: 0 @@ -36278,8 +36508,18 @@ MonoBehaviour: cardDataSummary: {fileID: 0} animator: {fileID: 0} borderAnim: {fileID: 0} + normalBorder: {fileID: 0} + triggerBorde: {fileID: 0} currentCost: 0 currentCostType: + tempIsDisposable: 0 + lastConditionBool: 0 + costIocn: {fileID: 0} + bloodIcon: {fileID: 0} + stepIcon: {fileID: 0} + nodeIcon: {fileID: 0} + tempMinusCost: 0 + colorValSprite: --- !u!224 &4372904059308576413 RectTransform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index 90fbb050..e3edbba6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -6744,6 +6744,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 643491996} m_CullTransparentMesh: 1 +--- !u!1 &650813627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 650813629} + - component: {fileID: 650813628} + m_Layer: 0 + m_Name: JumpInSceneManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &650813628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650813627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bfdec5ed77d820469d77443cfb386a8, type: 3} + m_Name: + m_EditorClassIdentifier: + cameraTrans: {fileID: 0} + cameraSpeed: 0.8 + endAngle: {x: 54, y: 0, z: 0} + endPos: {x: 0, y: 0, z: 0} + isAngle: 1 + desRoomFather: {fileID: 0} + roomPrefab: {fileID: 247809467470846845, guid: 1fb7dc5aa7bd9d641b6e7111d340a3e2, + type: 3} + mapIcon: {fileID: 21300000, guid: 48d1ff5b2e327784cb1ad45c2d4a6adf, type: 3} + monsterIcon: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + elitIcon: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} +--- !u!4 &650813629 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650813627} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &657490526 GameObject: m_ObjectHideFlags: 0 @@ -9536,7 +9591,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86c2fab3deda01e4fb16a6d8fbcda640, type: 3} m_Name: m_EditorClassIdentifier: - servantState: {fileID: 0} --- !u!4 &852531557 Transform: m_ObjectHideFlags: 0 @@ -26384,3 +26438,4 @@ SceneRoots: - {fileID: 365522763} - {fileID: 743889017} - {fileID: 707353375} + - {fileID: 650813629} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/TreasurePoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/TreasurePoint.unity index d4b47a66..9cc21875 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/TreasurePoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/TreasurePoint.unity @@ -3542,8 +3542,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -3552,6 +3552,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &295558191 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6453,8 +6465,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -6463,6 +6475,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &487180589 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7421,6 +7445,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542666609} m_CullTransparentMesh: 1 +--- !u!1 &555312949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 555312953} + - component: {fileID: 555312952} + - component: {fileID: 555312951} + - component: {fileID: 555312950} + m_Layer: 5 + m_Name: JumpInScenceCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &555312950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555312949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &555312951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555312949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &555312952 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555312949} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1897423685} + m_PlaneDistance: 6 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &555312953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555312949} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 902939462} + m_Father: {fileID: 0} + 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_Pivot: {x: 0, y: 0} --- !u!1 &566409669 GameObject: m_ObjectHideFlags: 0 @@ -10937,6 +11063,119 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &902939461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 902939462} + - component: {fileID: 902939466} + - component: {fileID: 902939465} + - component: {fileID: 902939464} + - component: {fileID: 902939463} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &902939462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902939461} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 555312953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 262.87} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &902939463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902939461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aebcb808cf656554f8ac3e37083b6e1d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &902939464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902939461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!114 &902939465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902939461} + m_Enabled: 0 + 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: 0.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &902939466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902939461} + m_CullTransparentMesh: 1 --- !u!1 &909459613 GameObject: m_ObjectHideFlags: 0 @@ -13421,7 +13660,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &1082158929 Canvas: m_ObjectHideFlags: 0 @@ -13431,7 +13670,7 @@ Canvas: m_GameObject: {fileID: 1082158926} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1897423685} m_PlaneDistance: 10 m_PixelPerfect: 0 @@ -13452,9 +13691,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082158926} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.399999} + m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 720835718} @@ -13464,9 +13703,9 @@ RectTransform: 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_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 30, y: -4.920001} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1082425749 GameObject: m_ObjectHideFlags: 0 @@ -19567,8 +19806,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 682719593} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp - m_MethodName: LoadTargetLevel - m_Mode: 3 + m_MethodName: JumpInSence + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -19577,6 +19816,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1575263866} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1587401300 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22700,6 +22951,7 @@ GameObject: - component: {fileID: 1897423685} - component: {fileID: 1897423684} - component: {fileID: 1897423687} + - component: {fileID: 1897423688} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -22825,6 +23077,20 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &1897423688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897423683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49272cebed15e24f805857ece0fed28, type: 3} + m_Name: + m_EditorClassIdentifier: + endVec: {x: 30, y: 5.08, z: 6} + isAngle: 0 --- !u!1 &1927267599 GameObject: m_ObjectHideFlags: 0 @@ -24903,3 +25169,4 @@ SceneRoots: - {fileID: 1012544606} - {fileID: 985674836} - {fileID: 391309334} + - {fileID: 555312953} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs index dbb5640b..b61750c8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs @@ -148,7 +148,8 @@ public class RewardManager : Singleton { //ScenceLoadManager.Instance.LoadTargetLevel(1); //局内跳转 - + rewardPanle .gameObject .SetActive(false); + JumpInScenceManager.Instance.JumpInSence(); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs new file mode 100644 index 00000000..0374489e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class JumpInScenceNode : MonoBehaviour +{ + public Image image; + public int jumpDestination; + public int line; + public int column; + public bool isMap; + public void JumpToDestination() + { + ScenceLoadManager .Instance .LoadTargetLevel (jumpDestination); + if(isMap ==false ) + { + PlayerStatsManager.Instance.levelDevelopData.currentPoint = new Vector2(line, column); + PlayerStatsManager.Instance.levelDevelopData.levelSaveMap[line].levelDataList[column].passBy = true; + PlayerStatsManager.Instance.levelDevelopData.levelStep += 1; + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs.meta new file mode 100644 index 00000000..1b95c185 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInScenceNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1f84a6e69e1c4f041be111bbf02dd89e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs index 8f842caa..c19d2002 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs @@ -1,23 +1,112 @@ +using Cinemachine; using System.Collections; using System.Collections.Generic; using UnityEngine; +using static LevelDevelopData_SO; -public class JumpInScence : MonoBehaviour +public class JumpInScenceManager : Singleton { - public Transform desIconFather; + [Header("摄像机移动参数")] + public Transform cameraTrans; + public float cameraSpeed; + public Vector3 endAngle; + public Vector3 endPos; + public bool isAngle;//标识是平移还是转圈 + + [Header("房间图标生成参数")] + public Transform desRoomFather; + public GameObject roomPrefab; + [Header("房间图标")] + public Sprite mapIcon; public Sprite monsterIcon; - public Sprite eliteMonsterIcon; - public Sprite eliteAndMonsterIcon; - public Sprite bossIcon; - public Sprite shopIcon; - public Sprite campfireIcon; - public Sprite incidentIcon; - public Sprite treasureIcon; - public Sprite forgingIcon; - public Sprite deleteCardIcon; - public Sprite addCardIcon; - public Sprite resourceIcon; - public Sprite potionIcon; - public Sprite startIcon; + public Sprite elitIcon; + + private void Start() + { + DontDestroyOnLoad(this.gameObject); + } + + public void JumpInSence() + { + StartCoroutine(GenerateRoom()); + } + IEnumerator GenerateRoom() + { + yield return StartCoroutine(UpMoveCamera()); + + (int x, int y) currentPoint = ((int)PlayerStatsManager.Instance.levelDevelopData.currentPoint.x, (int)PlayerStatsManager.Instance.levelDevelopData.currentPoint.y); + List nextLevelNodes = PlayerStatsManager.Instance.levelDevelopData.levelSaveMap[currentPoint.x].levelDataList[currentPoint.y].nextLevelNodes; + + if(nextLevelNodes.Count>1) + { + //生成返回地图按钮 + GameObject room = Instantiate(roomPrefab, desRoomFather); + JumpInScenceNode jumpIn = room.GetComponent(); + jumpIn.image.sprite = mapIcon; + jumpIn.jumpDestination = 1; + jumpIn .isMap = true; + } + else + { + levelData currentLevelData = PlayerStatsManager.Instance.levelDevelopData.levelSaveMap[(int)nextLevelNodes[0].x].levelDataList[(int)nextLevelNodes[0].y]; + SetUPRoom(currentLevelData); + } + + + } + IEnumerator UpMoveCamera() + { + if(isAngle ) + { + float time = 0; + Vector3 startAngle = cameraTrans.eulerAngles; + while (time < 1) + { + cameraTrans.eulerAngles = Vector3.Lerp(startAngle, endAngle, time += Time.deltaTime * cameraSpeed); + yield return null; + } + } + else + { + float time = 0; + Vector3 startPos = cameraTrans.position ; + while (time < 1) + { + cameraTrans.position = Vector3.Lerp(startPos, endPos, time += Time.deltaTime * cameraSpeed); + yield return null; + } + } + + } + + public void SetUPRoom(levelData levelData ) + { + if(levelData .isExtra ==false ) + { + GameObject room = Instantiate(roomPrefab, desRoomFather); + JumpInScenceNode jumpIn = room.GetComponent(); + jumpIn.image.sprite = levelData.roomSprite; + jumpIn.jumpDestination = levelData .roomDestinationIndex; + jumpIn.line = levelData.line; + jumpIn.column = levelData.column; + } + else + { + GameObject room = Instantiate(roomPrefab, desRoomFather); + JumpInScenceNode jumpIn = room.GetComponent(); + jumpIn.image.sprite = monsterIcon; + jumpIn.jumpDestination = levelData.roomDestinationIndex; + jumpIn.line = levelData.line; + jumpIn.column = levelData.column; + + GameObject elitRoom = Instantiate(roomPrefab, desRoomFather); + JumpInScenceNode jumpInElit = elitRoom.GetComponent(); + jumpInElit.image.sprite = elitIcon; + jumpInElit.jumpDestination = levelData.roomDestinationIndex; + jumpInElit.line = levelData.line; + jumpInElit.column = levelData.column; + } + } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs new file mode 100644 index 00000000..2306b3e5 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RegistJumpInScence : MonoBehaviour +{ + + private void Start() + { + if (JumpInScenceManager.Instance != null) + { + JumpInScenceManager.Instance.desRoomFather = this.gameObject.transform; + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs.meta new file mode 100644 index 00000000..be2109bd --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegistJumpInScence.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aebcb808cf656554f8ac3e37083b6e1d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs new file mode 100644 index 00000000..fd26b96e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RegisteJumpInScenceCamera : MonoBehaviour +{ + public Vector3 endVec; + public bool isAngle; + private void Start() + { + if(JumpInScenceManager .Instance != null ) + { + JumpInScenceManager.Instance.cameraTrans = this.gameObject.transform; + + JumpInScenceManager.Instance.isAngle = isAngle; + if(isAngle) + { + JumpInScenceManager.Instance.endAngle = endVec; + } + else + { + JumpInScenceManager.Instance.endPos = endVec; + } + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs.meta new file mode 100644 index 00000000..f48b9de8 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f49272cebed15e24f805857ece0fed28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs index db6c18be..1cf7fb9c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs @@ -78,8 +78,9 @@ public class LeveGeneraterNew : Singleton // CheckNodeRule(); PlayerStatsManager.Instance.levelDevelopData.levelStep = 1; PlayerStatsManager.Instance.levelDevelopData.currentPoint = new Vector2(0, 1); - ShowMap(); - SetRoomEnemyPoolAndMap(); + ShowMap(); + SetRoomEnemyPoolAndMap(); + } //生成网格 public void GenerateGridMap(int generatorLine, int generatorColumn) @@ -675,21 +676,24 @@ public class LeveGeneraterNew : Singleton { for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) { + LevelNode levelNode = LevelDevelopManager.Instance.levelMap[i].levelColumn[j].GetComponent(); if (LevelDevelopManager.Instance.levelMap[i].levelColumn[j].isUse == false) { LevelDevelopManager.Instance.levelMap[i].levelColumn[j].gameObject.SetActive(false); } else { - LevelDevelopManager.Instance.levelMap[i].levelColumn[j].GetComponent().LineShow(); + levelNode.LineShow(); } - LevelDevelopManager.Instance.levelMap[i].levelColumn[j].GetComponent().JudgeCanEnter(); + levelNode.JudgeCanEnter(); + //设置房间目的地 + levelNode.SetUPRoomDestination(); } } } - + //载入保存数据 public void SaveDataLoader() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs index 36c01d8d..917a34d4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs @@ -224,6 +224,7 @@ public class LevelNode : MonoBehaviour levelData.nodePos = this.transform.position; levelData.column = column; levelData.line = line; + levelData .roomDestinationIndex = roomDestinationIndex; foreach (var father in fatherLevelNodes ) { levelData.fatherLevelNodes.Add(new Vector2 (father .line ,father .column )); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddManager.cs index ffa2a9e2..e0433479 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddManager.cs @@ -4,10 +4,10 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -public class CardAddManager : MonoBehaviour +public class CardAddManager : Singleton { public List cardSlots; - + public GameObject cardPanel; private void Start() { GeneratorRewardCard(cardSlots); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddNode.cs index 64fb62a0..76acd748 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddNode.cs @@ -16,6 +16,7 @@ public class CardAddNode : MonoBehaviour private void LoadToMapScence() { - ScenceLoadManager.Instance.LoadTargetLevel(1); + ScenceLoadManager.Instance.JumpInSence(); + CardAddManager.Instance.cardPanel.gameObject.SetActive(false); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs index b1b6695b..00b9d62e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs @@ -26,7 +26,7 @@ public class LevelDevelopData_SO : ScriptableObject public Vector3 nodePos; public int line;//行 public int column;//列 - + public int roomDestinationIndex;//目的跳转场景 public List fatherLevelNodes = new List(); public List nextLevelNodes = new List(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs index a3d3407c..f00e6453 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs @@ -221,7 +221,8 @@ public class EventManager : Singleton jumpButton .gameObject .SetActive(true); jumpButton.onClick.RemoveAllListeners(); jumpButtonNode.targetScenceIndex = loadIndex; - jumpButton.onClick.AddListener(jumpButtonNode.JumpToScence); + // jumpButton.onClick.AddListener(jumpButtonNode.JumpToScence); + jumpButton.onClick.AddListener(ScenceLoadManager.Instance.JumpInSence); break; //更改切换场景按钮文案 case 104: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs index a653d52f..dc73b119 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs @@ -14,7 +14,10 @@ public class ScenceLoadManager : Singleton { StartCoroutine(LoadLevel(levelIndex)); } - + public void JumpInSence() + { + JumpInScenceManager.Instance.JumpInSence(); + } IEnumerator LoadLevel(int levelIndex) { yield return new WaitForSeconds(0.5f);