diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_Subway.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_Subway.asset index ccf825a58..13c1477ca 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Scene_Subway.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Scene_Subway.asset @@ -47,6 +47,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 66be33a1bdb16ee409c6ac05b61e08a7 + m_Address: "Subway/\u76F8\u9519\u5217\u8F66" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏loop.anim b/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏loop.anim index e29cdeede..bd0ca6b43 100644 --- a/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏loop.anim +++ b/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏loop.anim @@ -21,21 +21,21 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 6840156550563268254, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 8406608230730197033, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.3 - value: {fileID: 6859219705196112515, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -638474868853858091, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.6 - value: {fileID: 6179875850159260718, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -6025158571412764000, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.90000004 - value: {fileID: -5081968170355746866, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 7167235528653426619, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.2 - value: {fileID: 5367341067529554582, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -7787346505108048122, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.5 - value: {fileID: 4034447014785714212, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 695515459346889990, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.8 - value: {fileID: -4048179399956102038, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 4125638700941698598, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.1 - value: {fileID: -4048179399956102038, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 4125638700941698598, guid: 73def603ca61b39438ad172fd1536786, type: 3} attribute: m_Sprite path: classID: 114 diff --git a/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏动画.anim b/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏动画.anim index 27c2b68a8..3de6322ae 100644 --- a/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏动画.anim +++ b/Assets/GameContent/Feature_MainUI/Aniamtion/亮屏动画.anim @@ -21,57 +21,57 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 3590298006132234197, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 1861404412343999680, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.3 - value: {fileID: 4212493904117688442, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 1413919155382678508, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.6 - value: {fileID: -387524978352016511, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -1235697394429773224, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.90000004 - value: {fileID: 7801700163853764768, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -3238186813010369515, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.2 - value: {fileID: 711219979135128828, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 6553456801586742388, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.5 - value: {fileID: 4267215280997433592, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 3217636073882538196, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.8 - value: {fileID: 649394415776010123, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 2022406443330375071, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.1 - value: {fileID: 317381804168222667, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 7955496583822087132, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.3999999 - value: {fileID: -1712740933478016488, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -704461385315602642, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.4299998 - value: {fileID: 2405545755500861010, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -5611566494653657320, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.4599998 - value: {fileID: -995732229373678935, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -5314824590799001897, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.4899998 - value: {fileID: 7743725875444303658, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -671726242282283569, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.5049999 - value: {fileID: 4720126138351216526, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 7236507362618409808, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.52 - value: {fileID: -7456328238438083341, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -6647109160895501989, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.55 - value: {fileID: 1624408415468815096, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -1169533510377659976, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.58 - value: {fileID: -3912150861758148666, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 5676380592428147700, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.61 - value: {fileID: -3485725615810799470, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -1996404556247743138, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.6399999 - value: {fileID: 563418682396710732, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -1266187999719438964, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.6699998 - value: {fileID: -1621594311118950475, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -5645632618340218942, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.6999998 - value: {fileID: -2389446049106371289, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 6287908651006406666, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.7299998 - value: {fileID: -8255714429177961685, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 7914112355087158239, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 3.0299997 - value: {fileID: 1584577596599159291, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -497961517769030611, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 3.3299997 - value: {fileID: 4990357603736357962, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 5540986554834896281, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 3.6299996 - value: {fileID: -3996596820084109666, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -917497676344744184, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 3.9299996 - value: {fileID: 2106986351469202532, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 1344570060650276432, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 4.2299995 - value: {fileID: 2106986351469202532, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 1344570060650276432, guid: 73def603ca61b39438ad172fd1536786, type: 3} attribute: m_Sprite path: classID: 114 diff --git a/Assets/GameContent/Feature_MainUI/Aniamtion/倒影loop.anim b/Assets/GameContent/Feature_MainUI/Aniamtion/倒影loop.anim index de1b718ac..c2794321a 100644 --- a/Assets/GameContent/Feature_MainUI/Aniamtion/倒影loop.anim +++ b/Assets/GameContent/Feature_MainUI/Aniamtion/倒影loop.anim @@ -21,21 +21,21 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -4136375617897137844, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 4302037580025263575, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.3 - value: {fileID: -4479527062766389854, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -4015480929688852251, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.6 - value: {fileID: -4268351921501975114, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -4553182726969712293, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 0.90000004 - value: {fileID: -6887488568323005115, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 4197472929634859046, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.2 - value: {fileID: -5163234800086539867, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: 8632944352721766496, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.5 - value: {fileID: -7174022090250177913, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -5578581463412734992, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 1.8 - value: {fileID: -6836389288971555806, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -9082758025099512139, guid: 73def603ca61b39438ad172fd1536786, type: 3} - time: 2.1 - value: {fileID: -6836389288971555806, guid: 73def603ca61b39438ad172fd1536786, type: 3} + value: {fileID: -9082758025099512139, guid: 73def603ca61b39438ad172fd1536786, type: 3} attribute: m_Sprite path: classID: 114 diff --git a/Assets/GameContent/Feature_MainUI/Aniamtion/开始界面屏幕.controller b/Assets/GameContent/Feature_MainUI/Aniamtion/开始界面屏幕.controller index 6ef80d620..4b592c232 100644 --- a/Assets/GameContent/Feature_MainUI/Aniamtion/开始界面屏幕.controller +++ b/Assets/GameContent/Feature_MainUI/Aniamtion/开始界面屏幕.controller @@ -63,7 +63,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.json b/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.json index befa25af4..64209f53c 100644 --- a/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.json +++ b/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.json @@ -1,323 +1,323 @@ { "frames": { - "开始电视界面(1) 0.aseprite": { - "frame": { "x": 0, "y": 0, "w": 160, "h": 128 }, + "开始电视界面 0.aseprite": { + "frame": { "x": 0, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 1.aseprite": { - "frame": { "x": 160, "y": 0, "w": 160, "h": 128 }, + "开始电视界面 1.aseprite": { + "frame": { "x": 150, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 2.aseprite": { - "frame": { "x": 320, "y": 0, "w": 160, "h": 128 }, + "开始电视界面 2.aseprite": { + "frame": { "x": 300, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 3.aseprite": { - "frame": { "x": 480, "y": 0, "w": 160, "h": 128 }, + "开始电视界面 3.aseprite": { + "frame": { "x": 450, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 4.aseprite": { - "frame": { "x": 640, "y": 0, "w": 160, "h": 128 }, + "开始电视界面 4.aseprite": { + "frame": { "x": 600, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 5.aseprite": { - "frame": { "x": 800, "y": 0, "w": 160, "h": 128 }, + "开始电视界面 5.aseprite": { + "frame": { "x": 750, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 6.aseprite": { - "frame": { "x": 0, "y": 128, "w": 160, "h": 128 }, + "开始电视界面 6.aseprite": { + "frame": { "x": 0, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 7.aseprite": { - "frame": { "x": 160, "y": 128, "w": 160, "h": 128 }, + "开始电视界面 7.aseprite": { + "frame": { "x": 0, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 8.aseprite": { - "frame": { "x": 320, "y": 128, "w": 160, "h": 128 }, + "开始电视界面 8.aseprite": { + "frame": { "x": 150, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 9.aseprite": { - "frame": { "x": 480, "y": 128, "w": 160, "h": 128 }, + "开始电视界面 9.aseprite": { + "frame": { "x": 150, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 10.aseprite": { - "frame": { "x": 640, "y": 128, "w": 160, "h": 128 }, + "开始电视界面 10.aseprite": { + "frame": { "x": 300, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 11.aseprite": { - "frame": { "x": 800, "y": 128, "w": 160, "h": 128 }, + "开始电视界面 11.aseprite": { + "frame": { "x": 450, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 15 }, - "开始电视界面(1) 12.aseprite": { - "frame": { "x": 0, "y": 256, "w": 160, "h": 128 }, + "开始电视界面 12.aseprite": { + "frame": { "x": 600, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 15 }, - "开始电视界面(1) 13.aseprite": { - "frame": { "x": 160, "y": 256, "w": 160, "h": 128 }, + "开始电视界面 13.aseprite": { + "frame": { "x": 750, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 14.aseprite": { - "frame": { "x": 320, "y": 256, "w": 160, "h": 128 }, + "开始电视界面 14.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 15.aseprite": { - "frame": { "x": 480, "y": 256, "w": 160, "h": 128 }, + "开始电视界面 15.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 16.aseprite": { - "frame": { "x": 640, "y": 256, "w": 160, "h": 128 }, + "开始电视界面 16.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 17.aseprite": { - "frame": { "x": 800, "y": 256, "w": 160, "h": 128 }, + "开始电视界面 17.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 18.aseprite": { - "frame": { "x": 0, "y": 384, "w": 160, "h": 128 }, + "开始电视界面 18.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 19.aseprite": { - "frame": { "x": 160, "y": 384, "w": 160, "h": 128 }, + "开始电视界面 19.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 30 }, - "开始电视界面(1) 20.aseprite": { - "frame": { "x": 320, "y": 384, "w": 160, "h": 128 }, + "开始电视界面 20.aseprite": { + "frame": { "x": 150, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 21.aseprite": { - "frame": { "x": 480, "y": 384, "w": 160, "h": 128 }, + "开始电视界面 21.aseprite": { + "frame": { "x": 300, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 22.aseprite": { - "frame": { "x": 640, "y": 384, "w": 160, "h": 128 }, + "开始电视界面 22.aseprite": { + "frame": { "x": 450, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 23.aseprite": { - "frame": { "x": 800, "y": 384, "w": 160, "h": 128 }, + "开始电视界面 23.aseprite": { + "frame": { "x": 600, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 24.aseprite": { - "frame": { "x": 0, "y": 512, "w": 160, "h": 128 }, + "开始电视界面 24.aseprite": { + "frame": { "x": 750, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 25.aseprite": { - "frame": { "x": 160, "y": 512, "w": 160, "h": 128 }, + "开始电视界面 25.aseprite": { + "frame": { "x": 0, "y": 336, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 26.aseprite": { - "frame": { "x": 320, "y": 512, "w": 160, "h": 128 }, + "开始电视界面 26.aseprite": { + "frame": { "x": 0, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 27.aseprite": { - "frame": { "x": 480, "y": 512, "w": 160, "h": 128 }, + "开始电视界面 27.aseprite": { + "frame": { "x": 150, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 28.aseprite": { - "frame": { "x": 640, "y": 512, "w": 160, "h": 128 }, + "开始电视界面 28.aseprite": { + "frame": { "x": 300, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 29.aseprite": { - "frame": { "x": 800, "y": 512, "w": 160, "h": 128 }, + "开始电视界面 29.aseprite": { + "frame": { "x": 450, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 30.aseprite": { - "frame": { "x": 0, "y": 640, "w": 160, "h": 128 }, + "开始电视界面 30.aseprite": { + "frame": { "x": 600, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 31.aseprite": { - "frame": { "x": 160, "y": 640, "w": 160, "h": 128 }, + "开始电视界面 31.aseprite": { + "frame": { "x": 750, "y": 224, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 32.aseprite": { - "frame": { "x": 320, "y": 640, "w": 160, "h": 128 }, + "开始电视界面 32.aseprite": { + "frame": { "x": 0, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 33.aseprite": { - "frame": { "x": 480, "y": 640, "w": 160, "h": 128 }, + "开始电视界面 33.aseprite": { + "frame": { "x": 150, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 34.aseprite": { - "frame": { "x": 640, "y": 640, "w": 160, "h": 128 }, + "开始电视界面 34.aseprite": { + "frame": { "x": 300, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 35.aseprite": { - "frame": { "x": 800, "y": 640, "w": 160, "h": 128 }, + "开始电视界面 35.aseprite": { + "frame": { "x": 450, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 36.aseprite": { - "frame": { "x": 0, "y": 768, "w": 160, "h": 128 }, + "开始电视界面 36.aseprite": { + "frame": { "x": 600, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 37.aseprite": { - "frame": { "x": 160, "y": 768, "w": 160, "h": 128 }, + "开始电视界面 37.aseprite": { + "frame": { "x": 750, "y": 0, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 }, - "开始电视界面(1) 38.aseprite": { - "frame": { "x": 320, "y": 768, "w": 160, "h": 128 }, + "开始电视界面 38.aseprite": { + "frame": { "x": 0, "y": 112, "w": 150, "h": 112 }, "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 112, "y": 32, "w": 160, "h": 128 }, - "sourceSize": { "w": 384, "h": 216 }, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 150, "h": 112 }, + "sourceSize": { "w": 150, "h": 112 }, "duration": 300 } }, "meta": { "app": "https://www.aseprite.org/", "version": "1.3.17.2-x64", - "image": "开始电视屏幕.png", + "image": "开始电视界面.png", "format": "RGBA8888", - "size": { "w": 1024, "h": 896 }, + "size": { "w": 1024, "h": 448 }, "scale": "1", "frameTags": [ { "name": "亮屏动画", "from": 0, "to": 24, "direction": "forward", "color": "#000000ff" }, @@ -327,7 +327,7 @@ "layers": [ { "name": "动画", "opacity": 255, "blendMode": "normal" }, { "name": "半透", "opacity": 179, "blendMode": "normal" }, - { "name": "亮屏", "opacity": 135, "blendMode": "color_dodge" }, + { "name": "亮屏53到38了", "opacity": 97, "blendMode": "color_dodge" }, { "name": "亮屏B", "opacity": 255, "blendMode": "color_dodge" }, { "name": "亮屏B 复制", "opacity": 255, "blendMode": "color_dodge" } ], diff --git a/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png b/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png index 4425eee21..9f6112660 100644 --- a/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png +++ b/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a16111a55f980875059e8dc49025e1cfb0a7d860d24e617927f232c38b40500f -size 208129 +oid sha256:fe08107e1cc52e39dc5559ea4c488bf57c639cfe3e92a0a9ae41227a67a9487e +size 134980 diff --git a/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png.meta b/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png.meta index ec41a0dce..9cf9ac0ce 100644 --- a/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png.meta +++ b/Assets/GameContent/Feature_MainUI/AnimationRaw/开始电视屏幕.png.meta @@ -149,13 +149,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 0.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 0.aseprite" rect: serializedVersion: 2 x: 0 - y: 768 - width: 160 - height: 128 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -163,20 +163,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 46804dac140969b4186fae14cc0aca31 - internalID: 3590298006132234197 + spriteID: 7b2cf2ed0166bf34399d09d94757547e + internalID: 1861404412343999680 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 1.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 1.aseprite" rect: serializedVersion: 2 - x: 160 - y: 768 - width: 160 - height: 128 + x: 150 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -184,20 +184,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 6d2652eb93c5aa34494be7d384d024bb - internalID: 4212493904117688442 + spriteID: e72e7c6a58db39c45a71252032194a30 + internalID: 1413919155382678508 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 2.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 2.aseprite" rect: serializedVersion: 2 - x: 320 - y: 768 - width: 160 - height: 128 + x: 300 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -205,20 +205,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 3e515a2a9510e0949b37c5117184c5a1 - internalID: -387524978352016511 + spriteID: f4c96ed0fb23ef04eb605a887f4d0d67 + internalID: -1235697394429773224 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 3.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 3.aseprite" rect: serializedVersion: 2 - x: 480 - y: 768 - width: 160 - height: 128 + x: 450 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -226,20 +226,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 71f0cba7e4f640f4d8b57d317c8a08fc - internalID: 7801700163853764768 + spriteID: 255ea64cccd047e408b46a8115cf7863 + internalID: -3238186813010369515 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 4.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 4.aseprite" rect: serializedVersion: 2 - x: 640 - y: 768 - width: 160 - height: 128 + x: 600 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -247,20 +247,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 7f2ac0345163e6b4e8e2c8178b60f97b - internalID: 711219979135128828 + spriteID: 62bea03c6d28a74439bba8e227879b81 + internalID: 6553456801586742388 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 5.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 5.aseprite" rect: serializedVersion: 2 - x: 800 - y: 768 - width: 160 - height: 128 + x: 750 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -268,20 +268,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: aa068a57ee52ec94eaaf715dc0c9da85 - internalID: 4267215280997433592 + spriteID: 0a05aae7acd0fff46a7915dd0036c89e + internalID: 3217636073882538196 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 6.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 6.aseprite" rect: serializedVersion: 2 x: 0 - y: 640 - width: 160 - height: 128 + y: 224 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -289,125 +289,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 6abf9fe1c0ea7514fad327ac29314fb3 - internalID: 649394415776010123 + spriteID: daf65aa4df2eb1c4abb8a25e265d1ed7 + internalID: 2022406443330375071 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 7.aseprite" - rect: - serializedVersion: 2 - x: 160 - y: 640 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 5d2ddfe783f9c8949bcb8c19767c7627 - internalID: 317381804168222667 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 8.aseprite" - rect: - serializedVersion: 2 - x: 320 - y: 640 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 450646306d3309440bfbd33e88f5b9f8 - internalID: -1712740933478016488 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 9.aseprite" - rect: - serializedVersion: 2 - x: 480 - y: 640 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 0791a916ea63b8e449ec4c024370e8c4 - internalID: 2405545755500861010 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 10.aseprite" - rect: - serializedVersion: 2 - x: 640 - y: 640 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c31fbc9507bcd0c45826f3e950c4b3d7 - internalID: -995732229373678935 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 11.aseprite" - rect: - serializedVersion: 2 - x: 800 - y: 640 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 4bebe187222871d4388c6837471d6497 - internalID: 7743725875444303658 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 12.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 7.aseprite" rect: serializedVersion: 2 x: 0 - y: 512 - width: 160 - height: 128 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -415,20 +310,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 99ac229e5c000544db15b1e128e453e2 - internalID: 4720126138351216526 + spriteID: fecbc0126c5ae1348a55af2cc684c205 + internalID: 7955496583822087132 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 13.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 8.aseprite" rect: serializedVersion: 2 - x: 160 - y: 512 - width: 160 - height: 128 + x: 150 + y: 336 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -436,20 +331,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 1ce582fc52b75ed4a809561638bbe949 - internalID: -7456328238438083341 + spriteID: a38029f367029ef47bd6035e15704858 + internalID: -704461385315602642 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 14.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 9.aseprite" rect: serializedVersion: 2 - x: 320 - y: 512 - width: 160 - height: 128 + x: 150 + y: 224 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -457,20 +352,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 7fe3a2f93e7c51e48b7be3f61eb4d2db - internalID: 1624408415468815096 + spriteID: f9dc9315f0153b946a7e155089992123 + internalID: -5611566494653657320 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 15.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 10.aseprite" rect: serializedVersion: 2 - x: 480 - y: 512 - width: 160 - height: 128 + x: 300 + y: 224 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -478,20 +373,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 8c7de780ce2191344a35d5be61468a9a - internalID: -3912150861758148666 + spriteID: 5be4ecef6cfc4da418eaa3f5c5f16c8f + internalID: -5314824590799001897 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 16.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 11.aseprite" rect: serializedVersion: 2 - x: 640 - y: 512 - width: 160 - height: 128 + x: 450 + y: 224 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -499,20 +394,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 85a65ce8d9df62c4fb1d7798cf8fac17 - internalID: -3485725615810799470 + spriteID: d6828be7fab202249b0bdca1f31fef40 + internalID: -671726242282283569 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 17.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 12.aseprite" rect: serializedVersion: 2 - x: 800 - y: 512 - width: 160 - height: 128 + x: 600 + y: 224 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -520,20 +415,41 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 74c7f139ec7bedc4d9e03702fac1e998 - internalID: 563418682396710732 + spriteID: ab110b193e097be459414d5f6b1e439e + internalID: 7236507362618409808 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 18.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 13.aseprite" + rect: + serializedVersion: 2 + x: 750 + y: 224 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d726c7557730cff42be4902f0f42f19a + internalID: -6647109160895501989 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 14.aseprite" rect: serializedVersion: 2 x: 0 - y: 384 - width: 160 - height: 128 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -541,125 +457,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 5ed806481cc46ee48aa2af76e0a335c3 - internalID: -1621594311118950475 + spriteID: 635e276b1f6db56439d294bfe49a9b9c + internalID: -1169533510377659976 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 19.aseprite" - rect: - serializedVersion: 2 - x: 160 - y: 384 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8064d6306165b984cba3a325c3a352c5 - internalID: -2389446049106371289 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 20.aseprite" - rect: - serializedVersion: 2 - x: 320 - y: 384 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f3a66f2f6870c924daccd537f5a6b273 - internalID: -8255714429177961685 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 21.aseprite" - rect: - serializedVersion: 2 - x: 480 - y: 384 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 25475341765e6074495a3d0a156a775a - internalID: 1584577596599159291 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 22.aseprite" - rect: - serializedVersion: 2 - x: 640 - y: 384 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 00e6a3f034230924f894fc59c2d1f531 - internalID: 4990357603736357962 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 23.aseprite" - rect: - serializedVersion: 2 - x: 800 - y: 384 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 89a27aed41caa604ca614e92d7f77872 - internalID: -3996596820084109666 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 24.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 15.aseprite" rect: serializedVersion: 2 x: 0 - y: 256 - width: 160 - height: 128 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -667,125 +478,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: ecf3f8a258add884e836aa20c3a68284 - internalID: 2106986351469202532 + spriteID: f7f28e5168316e64684910c7ad16cba3 + internalID: 5676380592428147700 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 25.aseprite" - rect: - serializedVersion: 2 - x: 160 - y: 256 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 40fc27a326c0c3e44ae7a5f96d238097 - internalID: 6840156550563268254 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 26.aseprite" - rect: - serializedVersion: 2 - x: 320 - y: 256 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f42b6a29710400b488daa36cb5f9191b - internalID: 6859219705196112515 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 27.aseprite" - rect: - serializedVersion: 2 - x: 480 - y: 256 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9462598780f92a842b4959f6d7266514 - internalID: 6179875850159260718 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 28.aseprite" - rect: - serializedVersion: 2 - x: 640 - y: 256 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8be16cff2d4401d469d4d37d7ef9b5e0 - internalID: -5081968170355746866 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 29.aseprite" - rect: - serializedVersion: 2 - x: 800 - y: 256 - width: 160 - height: 128 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 150d8246cea2d7d49b52490d0544a0fc - internalID: 5367341067529554582 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 30.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 16.aseprite" rect: serializedVersion: 2 x: 0 - y: 128 - width: 160 - height: 128 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -793,20 +499,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: a19da4e702ac8c94799aa53541c18e2c - internalID: 4034447014785714212 + spriteID: db0fe7bd19113774ea7ae0cc615e5113 + internalID: -1996404556247743138 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 31.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 17.aseprite" rect: serializedVersion: 2 - x: 160 - y: 128 - width: 160 - height: 128 + x: 0 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -814,20 +520,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 4d0145d96563ebc4f84746a3b60854dc - internalID: -4048179399956102038 + spriteID: 68c094e33719aa64b974cf1e4bfe60ea + internalID: -1266187999719438964 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 32.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 18.aseprite" rect: serializedVersion: 2 - x: 320 - y: 128 - width: 160 - height: 128 + x: 0 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -835,20 +541,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 859bde8a98c2a3746a0adda8eb139fbc - internalID: -4136375617897137844 + spriteID: 034329dab8577b34f87213fffdaaac01 + internalID: -5645632618340218942 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 33.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 19.aseprite" rect: serializedVersion: 2 - x: 480 - y: 128 - width: 160 - height: 128 + x: 0 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -856,20 +562,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: d578d0d4beb7b1144880cd2276e77c9d - internalID: -4479527062766389854 + spriteID: bd020a0cc9faddd409f9e561edcfb447 + internalID: 6287908651006406666 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 34.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 20.aseprite" rect: serializedVersion: 2 - x: 640 - y: 128 - width: 160 - height: 128 + x: 150 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -877,20 +583,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 74d122d06fc67e6438d98e7982a3f43a - internalID: -4268351921501975114 + spriteID: 9cbf10c370b8ff74c8d5dd5663b7d1d8 + internalID: 7914112355087158239 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 35.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 21.aseprite" rect: serializedVersion: 2 - x: 800 - y: 128 - width: 160 - height: 128 + x: 300 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -898,20 +604,83 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 14c1026303f17414f984fff203440f6e - internalID: -6887488568323005115 + spriteID: 87128beeedaada842b8e6e39a56012e3 + internalID: -497961517769030611 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 36.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 22.aseprite" + rect: + serializedVersion: 2 + x: 450 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7b373c7107f65ef46a3719f53daf80a0 + internalID: 5540986554834896281 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 23.aseprite" + rect: + serializedVersion: 2 + x: 600 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e8b63b47c9515274ab97ca0562b6b34f + internalID: -917497676344744184 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 24.aseprite" + rect: + serializedVersion: 2 + x: 750 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ef128d56d0455004495b7f4d477f7764 + internalID: 1344570060650276432 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 25.aseprite" rect: serializedVersion: 2 x: 0 y: 0 - width: 160 - height: 128 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -919,20 +688,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 566e86891459f7140a03144337c95ee0 - internalID: -5163234800086539867 + spriteID: 797cd88feffee6147ab924946df6eb28 + internalID: 8406608230730197033 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 37.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 26.aseprite" rect: serializedVersion: 2 - x: 160 - y: 0 - width: 160 - height: 128 + x: 0 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -940,20 +709,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: eb97e24efdcddb04b96b104766fbeb5a - internalID: -7174022090250177913 + spriteID: bcb24080776c95f44be6089874552a99 + internalID: -638474868853858091 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 38.aseprite" + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 27.aseprite" rect: serializedVersion: 2 - x: 320 - y: 0 - width: 160 - height: 128 + x: 150 + y: 112 + width: 150 + height: 112 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -961,8 +730,239 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 74e3c4ccd92bda140b81db2257adc6c2 - internalID: -6836389288971555806 + spriteID: 8658ebb68801c514dbcbd3426483fe89 + internalID: -6025158571412764000 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 28.aseprite" + rect: + serializedVersion: 2 + x: 300 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c17e7dd9b725c7446852ead0c3e0f12f + internalID: 7167235528653426619 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 29.aseprite" + rect: + serializedVersion: 2 + x: 450 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0524887a164c4d443b1447e440bbc379 + internalID: -7787346505108048122 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 30.aseprite" + rect: + serializedVersion: 2 + x: 600 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3993a64a96dea5a4eb8d42fa0802fef9 + internalID: 695515459346889990 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 31.aseprite" + rect: + serializedVersion: 2 + x: 750 + y: 112 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d1e7242b36b3d2249be9155aa27a131a + internalID: 4125638700941698598 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 32.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 336 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 187cfe6fc403dc845a1bbddb0e9b8f5f + internalID: 4302037580025263575 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 33.aseprite" + rect: + serializedVersion: 2 + x: 150 + y: 336 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 88a04d81049334c4c80e01b5956cc734 + internalID: -4015480929688852251 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 34.aseprite" + rect: + serializedVersion: 2 + x: 300 + y: 336 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eecc79faa3d1a304e96ad00e2acf52f3 + internalID: -4553182726969712293 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 35.aseprite" + rect: + serializedVersion: 2 + x: 450 + y: 336 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8af46858504e39943acb1bfe2c8601d8 + internalID: 4197472929634859046 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 36.aseprite" + rect: + serializedVersion: 2 + x: 600 + y: 336 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7202d333f898515479effa4ee7f4f9af + internalID: 8632944352721766496 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 37.aseprite" + rect: + serializedVersion: 2 + x: 750 + y: 336 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 97be7fa0cbd61754ba254286f8ee9547 + internalID: -5578581463412734992 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5F00\u59CB\u7535\u89C6\u754C\u9762 38.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 224 + width: 150 + height: 112 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e00dcf92dc478094295961efb65446f4 + internalID: -9082758025099512139 vertices: [] indices: edges: [] @@ -978,45 +978,45 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 0.aseprite": 3590298006132234197 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 1.aseprite": 4212493904117688442 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 10.aseprite": -995732229373678935 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 11.aseprite": 7743725875444303658 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 12.aseprite": 4720126138351216526 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 13.aseprite": -7456328238438083341 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 14.aseprite": 1624408415468815096 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 15.aseprite": -3912150861758148666 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 16.aseprite": -3485725615810799470 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 17.aseprite": 563418682396710732 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 18.aseprite": -1621594311118950475 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 19.aseprite": -2389446049106371289 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 2.aseprite": -387524978352016511 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 20.aseprite": -8255714429177961685 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 21.aseprite": 1584577596599159291 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 22.aseprite": 4990357603736357962 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 23.aseprite": -3996596820084109666 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 24.aseprite": 2106986351469202532 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 25.aseprite": 6840156550563268254 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 26.aseprite": 6859219705196112515 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 27.aseprite": 6179875850159260718 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 28.aseprite": -5081968170355746866 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 29.aseprite": 5367341067529554582 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 3.aseprite": 7801700163853764768 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 30.aseprite": 4034447014785714212 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 31.aseprite": -4048179399956102038 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 32.aseprite": -4136375617897137844 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 33.aseprite": -4479527062766389854 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 34.aseprite": -4268351921501975114 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 35.aseprite": -6887488568323005115 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 36.aseprite": -5163234800086539867 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 37.aseprite": -7174022090250177913 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 38.aseprite": -6836389288971555806 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 4.aseprite": 711219979135128828 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 5.aseprite": 4267215280997433592 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 6.aseprite": 649394415776010123 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 7.aseprite": 317381804168222667 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 8.aseprite": -1712740933478016488 - "\u5F00\u59CB\u7535\u89C6\u754C\u9762(1) 9.aseprite": 2405545755500861010 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 0.aseprite": 1861404412343999680 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 1.aseprite": 1413919155382678508 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 10.aseprite": -5314824590799001897 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 11.aseprite": -671726242282283569 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 12.aseprite": 7236507362618409808 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 13.aseprite": -6647109160895501989 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 14.aseprite": -1169533510377659976 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 15.aseprite": 5676380592428147700 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 16.aseprite": -1996404556247743138 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 17.aseprite": -1266187999719438964 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 18.aseprite": -5645632618340218942 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 19.aseprite": 6287908651006406666 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 2.aseprite": -1235697394429773224 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 20.aseprite": 7914112355087158239 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 21.aseprite": -497961517769030611 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 22.aseprite": 5540986554834896281 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 23.aseprite": -917497676344744184 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 24.aseprite": 1344570060650276432 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 25.aseprite": 8406608230730197033 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 26.aseprite": -638474868853858091 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 27.aseprite": -6025158571412764000 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 28.aseprite": 7167235528653426619 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 29.aseprite": -7787346505108048122 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 3.aseprite": -3238186813010369515 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 30.aseprite": 695515459346889990 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 31.aseprite": 4125638700941698598 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 32.aseprite": 4302037580025263575 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 33.aseprite": -4015480929688852251 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 34.aseprite": -4553182726969712293 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 35.aseprite": 4197472929634859046 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 36.aseprite": 8632944352721766496 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 37.aseprite": -5578581463412734992 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 38.aseprite": -9082758025099512139 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 4.aseprite": 6553456801586742388 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 5.aseprite": 3217636073882538196 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 6.aseprite": 2022406443330375071 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 7.aseprite": 7955496583822087132 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 8.aseprite": -704461385315602642 + "\u5F00\u59CB\u7535\u89C6\u754C\u9762 9.aseprite": -5611566494653657320 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalHeader.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalHeader.prefab index 2e14a29e9..0304ab5ff 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalHeader.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalHeader.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 520, y: 42.5} + m_SizeDelta: {x: 550, y: 42.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1044319747855421302 CanvasRenderer: @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -227,8 +227,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -379,7 +379,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 0} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalMenuItem.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalMenuItem.prefab index 3bb7404df..3fad68d74 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalMenuItem.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/Common/TerminalMenuItem.prefab @@ -145,8 +145,8 @@ MonoBehaviour: cursor: {fileID: 4520098490234732032} selectionBar: {fileID: 7465867337594686350} defaultLabelKey: - normalTextColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 1} - selectedTextColor: {r: 0.02, g: 0.02, b: 0.04, a: 1} + normalTextColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} + selectedTextColor: {r: 0, g: 0, b: 0, a: 1} dangerTextColor: {r: 1, g: 0.18, b: 0.2, a: 1} disabledAlpha: 0.35 --- !u!1 &3742108334930405387 @@ -541,7 +541,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.627451} + m_Color: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab index 06d7d28c1..ecde01b02 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab @@ -75,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4284713133 - m_fontColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 1} + rgba: 2103675053 + m_fontColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -273,11 +273,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 1} - m_HighlightedColor: {r: 0.6320754, g: 0.5088406, b: 0.38560572, a: 1} - m_PressedColor: {r: 0.5471698, g: 0.43016493, b: 0.31316003, a: 1} - m_SelectedColor: {r: 0.4811321, g: 0.3737095, b: 0.2662869, a: 1} - m_DisabledColor: {r: 0.5283019, g: 0.4801234, b: 0.43194494, a: 0.5019608} + m_NormalColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} + m_HighlightedColor: {r: 0.6320754, g: 0.5088406, b: 0.38560572, a: 0.49019608} + m_PressedColor: {r: 0.5471698, g: 0.43016493, b: 0.31316003, a: 0.49019608} + m_SelectedColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} + m_DisabledColor: {r: 0.5283019, g: 0.4801234, b: 0.43194494, a: 0.23529412} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -409,11 +409,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 1} - m_HighlightedColor: {r: 0.6313726, g: 0.50980395, b: 0.38431373, a: 1} - m_PressedColor: {r: 0.54901963, g: 0.43137255, b: 0.3137255, a: 1} - m_SelectedColor: {r: 0.48235294, g: 0.3764706, b: 0.26666668, a: 1} - m_DisabledColor: {r: 0.5294118, g: 0.47843137, b: 0.43137255, a: 0.5019608} + m_NormalColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} + m_HighlightedColor: {r: 0.6313726, g: 0.50980395, b: 0.38431373, a: 0.49019608} + m_PressedColor: {r: 0.54901963, g: 0.43137255, b: 0.3137255, a: 0.49019608} + m_SelectedColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} + m_DisabledColor: {r: 0.5294118, g: 0.47843137, b: 0.43137255, a: 0.23529412} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -521,8 +521,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 2113929215 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.49019608} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -654,7 +654,7 @@ MonoBehaviour: m_EditorClassIdentifier: canvasGroup: {fileID: 4638119140970039337} sweep: {fileID: 0} - visibleAlpha: 0.8 + visibleAlpha: 0.6 fadeDuration: 0.06 showEase: 1 hideEase: 1 @@ -1181,6 +1181,14 @@ PrefabInstance: propertyPath: defaultLabel value: chapter_back objectReference: {fileID: 0} + - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} + propertyPath: hoverBackgroundColor.a + value: 0.3137255 + objectReference: {fileID: 0} + - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} + propertyPath: normalForegroundColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} propertyPath: disabledBackgroundColor.a value: 0 @@ -1306,6 +1314,14 @@ PrefabInstance: propertyPath: defaultLabel value: chapter_restart objectReference: {fileID: 0} + - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} + propertyPath: hoverBackgroundColor.a + value: 0.3137255 + objectReference: {fileID: 0} + - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} + propertyPath: normalForegroundColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} propertyPath: disabledBackgroundColor.a value: 0 diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab index 7ad1033fb..32a87b2d3 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab @@ -67,7 +67,7 @@ MonoBehaviour: m_EditorClassIdentifier: canvasGroup: {fileID: 2695752103100139348} sweep: {fileID: 0} - visibleAlpha: 0.8 + visibleAlpha: 0.6 fadeDuration: 0.06 showEase: 1 hideEase: 1 @@ -234,8 +234,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4284713133 - m_fontColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 1} + rgba: 2103675053 + m_fontColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -376,6 +376,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 1377516604571534447, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 1377516604571534447, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Colors.m_NormalColor.b value: 0.3882353 @@ -388,6 +392,10 @@ PrefabInstance: propertyPath: m_Colors.m_NormalColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 2370438686613021399, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 2370438686613021399, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Colors.m_NormalColor.b value: 0.3882353 @@ -416,6 +424,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: normalTextColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: normalTextColor.b value: 0.3882353 @@ -428,6 +440,10 @@ PrefabInstance: propertyPath: normalTextColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_PressedColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_PressedColor.b value: 0.28627452 @@ -440,6 +456,10 @@ PrefabInstance: propertyPath: lightRowButtonColors.m_PressedColor.r value: 0.3764706 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_DisabledColor.a + value: 0.23529412 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_DisabledColor.b value: 0.36862746 @@ -452,6 +472,10 @@ PrefabInstance: propertyPath: lightRowButtonColors.m_DisabledColor.r value: 0.4509804 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_HighlightedColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_HighlightedColor.b value: 0.35686275 @@ -617,6 +641,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 1377516604571534447, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 1377516604571534447, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Colors.m_NormalColor.b value: 0.3882353 @@ -629,6 +657,10 @@ PrefabInstance: propertyPath: m_Colors.m_NormalColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 2370438686613021399, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 2370438686613021399, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Colors.m_NormalColor.b value: 0.3882353 @@ -657,6 +689,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: normalTextColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: normalTextColor.b value: 0.3882353 @@ -669,6 +705,10 @@ PrefabInstance: propertyPath: normalTextColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_PressedColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_PressedColor.b value: 0.28717217 @@ -681,6 +721,10 @@ PrefabInstance: propertyPath: lightRowButtonColors.m_PressedColor.r value: 0.3773585 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_DisabledColor.a + value: 0.23529412 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_DisabledColor.b value: 0.3702385 @@ -693,6 +737,10 @@ PrefabInstance: propertyPath: lightRowButtonColors.m_DisabledColor.r value: 0.4528302 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_HighlightedColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_HighlightedColor.b value: 0.35570186 @@ -858,6 +906,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 1377516604571534447, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 1377516604571534447, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Colors.m_NormalColor.b value: 0.3882353 @@ -870,6 +922,10 @@ PrefabInstance: propertyPath: m_Colors.m_NormalColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 2370438686613021399, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 2370438686613021399, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Colors.m_NormalColor.b value: 0.3882353 @@ -898,6 +954,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: normalTextColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: normalTextColor.b value: 0.3882353 @@ -910,6 +970,10 @@ PrefabInstance: propertyPath: normalTextColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_PressedColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_PressedColor.b value: 0.28627452 @@ -922,6 +986,10 @@ PrefabInstance: propertyPath: lightRowButtonColors.m_PressedColor.r value: 0.3764706 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_DisabledColor.a + value: 0.23529412 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_DisabledColor.b value: 0.36862746 @@ -934,6 +1002,10 @@ PrefabInstance: propertyPath: lightRowButtonColors.m_DisabledColor.r value: 0.4509804 objectReference: {fileID: 0} + - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: lightRowButtonColors.m_HighlightedColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: lightRowButtonColors.m_HighlightedColor.b value: 0.35686275 @@ -1163,6 +1235,14 @@ PrefabInstance: propertyPath: defaultLabel value: setting_back objectReference: {fileID: 0} + - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} + propertyPath: hoverBackgroundColor.a + value: 0.3137255 + objectReference: {fileID: 0} + - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} + propertyPath: normalForegroundColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 8265843593356152544, guid: 24e2d015600209249867f62b2e07b9a9, type: 3} propertyPath: disabledBackgroundColor.a value: 0 @@ -1504,6 +1584,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6885231114081803451, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: normalTextColor.a + value: 0.49019608 + objectReference: {fileID: 0} - target: {fileID: 6885231114081803451, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: normalTextColor.b value: 0.3882353 diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalStartPanel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalStartPanel.prefab index 890f0817f..89568f8b6 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalStartPanel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalStartPanel.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_EditorClassIdentifier: canvasGroup: {fileID: 5054907813288028710} sweep: {fileID: 0} - visibleAlpha: 0.8 + visibleAlpha: 0.6 fadeDuration: 0.06 showEase: 1 hideEase: 1 @@ -232,8 +232,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4284713133 - m_fontColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 1} + rgba: 2103675053 + m_fontColor: {r: 0.6784314, g: 0.53333336, b: 0.3882353, a: 0.49019608} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -354,86 +354,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2174456505064790880} m_Modifications: - - target: {fileID: 985172343528037619, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 985172343528037619, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 985172343528037619, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 985172343528037619, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1026579172205415468, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_Name value: TerminalMenuItem objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: 'Current date: 00/2020' - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.r - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278846725 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.r - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278846725 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -514,82 +438,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: check ok - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.r - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278846725 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.r - value: 0.02 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278846725 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -623,34 +471,6 @@ PrefabInstance: propertyPath: m_Name value: TerminalMenuItem objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: 'Current date: xx/xxxx' - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -731,54 +551,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3742108334930405387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: pending - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 7711115893422081214, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -812,58 +584,6 @@ PrefabInstance: propertyPath: m_Name value: TerminalMenuItem objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: '-----: 00/0000' - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4281544447 - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4281544447 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -944,74 +664,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3742108334930405387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: ----- - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor32.rgba - value: 4281544447 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.b - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4520098490234732032, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_fontColor.g - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 7711115893422081214, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1045,34 +697,6 @@ PrefabInstance: propertyPath: m_Name value: TerminalMenuItem objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: 'Current date: 04/2020' - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1153,54 +777,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3742108334930405387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: pending - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 7711115893422081214, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1234,34 +810,6 @@ PrefabInstance: propertyPath: m_Name value: TerminalMenuItem (1) objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: 'Current date: 04/2020' - objectReference: {fileID: 0} - - target: {fileID: 1095041587756714077, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1124158456638716387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1399044041289847539, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1294,18 +842,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 45 objectReference: {fileID: 0} - - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1892841443481971995, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1354,54 +890,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2547177344942947685, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3742108334930405387, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3901933801489087140, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_text - value: pending - objectReference: {fileID: 0} - - target: {fileID: 4310710148504387072, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 7711115893422081214, guid: d3a721fac7be7fa4895e890f9be45e70, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd b/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd index 331fd761b..66b16a5b7 100644 --- a/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd +++ b/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a85e8192c925d36f5a62ff0558ec24bad3eebfe053651af45aba639d921cf1c -size 824396 +oid sha256:e8f105348e89202b11f9b7ae69152f2473b3420ca62e597e657fedf7f93c1b9e +size 1764516 diff --git a/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd.meta b/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd.meta index f9987649f..de55aea8f 100644 --- a/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd.meta +++ b/Assets/GameContent/Scene_Subway/Art/夜晚窗外.psd.meta @@ -105,8 +105,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2035 - y: 4 + x: 1004 + y: 452 width: 6 height: 206 spriteID: 7f00581e6aec6514abef66a067f114b8 @@ -117,7 +117,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1552, y: -6} + uvTransform: {x: 521, y: 442} spritePosition: {x: 483, y: 10} - name: langanB originalName: @@ -126,8 +126,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 618 + x: 981 + y: 452 width: 15 height: 209 spriteID: 2a4be9d138b35ac4ebc352c8dbf21d86 @@ -138,7 +138,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: -267, y: 611} + uvTransform: {x: 710, y: 445} spritePosition: {x: 271, y: 7} - name: "\u5E7F\u544A\u724C" originalName: @@ -147,8 +147,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 238 - y: 431 + x: 958 + y: 1063 width: 35 height: 72 spriteID: 16c9bd1958d4bf84bb04455a10102eb5 @@ -159,7 +159,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: -38, y: 382} + uvTransform: {x: 682, y: 1014} spritePosition: {x: 276, y: 49} - name: HOUSEA originalName: @@ -168,8 +168,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1448 - y: 4 + x: 619 + y: 452 width: 354 height: 216 spriteID: b4edb79b94269db4dbbce17ad9baeec9 @@ -180,7 +180,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1448, y: 4} + uvTransform: {x: 619, y: 452} spritePosition: {x: 360, y: 0} - name: HOUSEB originalName: @@ -210,8 +210,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1877 - y: 228 + x: 726 + y: 1063 width: 151 height: 86 spriteID: f29cb16cad2eb964d81fbd5971c78603 @@ -222,7 +222,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1877, y: 228} + uvTransform: {x: 726, y: 1063} spritePosition: {x: 378, y: 59} - name: "\u79D1\u5B66\u697CA" originalName: @@ -231,7 +231,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1923 + x: 839 y: 4 width: 104 height: 170 @@ -243,7 +243,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1923, y: 4} + uvTransform: {x: 839, y: 4} spritePosition: {x: 575, y: 0} - name: "\u79D1\u5B66\u697CB" originalName: @@ -252,7 +252,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1810 + x: 726 y: 4 width: 105 height: 183 @@ -264,7 +264,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1810, y: 4} + uvTransform: {x: 726, y: 4} spritePosition: {x: 254, y: 4} - name: "\u6469\u5929\u5927\u697C" originalName: @@ -273,8 +273,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 431 + x: 726 + y: 228 width: 95 height: 179 spriteID: e55213c6cc135c04a9ff3c4b2025d156 @@ -285,7 +285,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 431} + uvTransform: {x: 726, y: 228} spritePosition: {x: 436, y: 0} - name: HOUSEC originalName: @@ -294,7 +294,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1765 + x: 829 y: 228 width: 104 height: 144 @@ -306,41 +306,20 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1336, y: 228} + uvTransform: {x: 400, y: 228} spritePosition: {x: 429, y: 0} - - name: "\u4E2D\u8FDC\u666F1" + - name: HOUSEAA originalName: - pivot: {x: 0.5, y: 0} - alignment: 7 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 721 - y: 228 - width: 714 - height: 134 - spriteID: ea8adb8011d433b49915124dcd6ce0be - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 721, y: 228} - spritePosition: {x: 0, y: 0} - - name: "\u4E2D\u8FDC\u666F2" - originalName: - pivot: {x: 0.5, y: 0} - alignment: 7 + pivot: {x: 0.5, y: 0.5} + alignment: 0 border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 x: 4 - y: 228 - width: 709 - height: 155 - spriteID: 3f410a04ea297fe478cd08aa147831d6 + y: 676 + width: 571 + height: 216 + spriteID: e741c60680409014e8b4d64080434c77 spriteBone: [] spriteOutline: [] vertices: [] @@ -348,8 +327,113 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 228} - spritePosition: {x: 5, y: 0} + uvTransform: {x: -28, y: 676} + spritePosition: {x: 32, y: 0} + - name: HOUSEBB + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 452 + width: 607 + height: 216 + spriteID: e1e9dc58e64ec9543bdd6e05914c0317 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 452} + spritePosition: {x: 37, y: 0} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1385 + width: 314 + height: 181 + spriteID: fad40253f6cd8ab4884ae7d6ed9c96dd + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1385} + spritePosition: {x: 246, y: 0} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 347 + y: 1205 + width: 314 + height: 166 + spriteID: 6fc485874b504224189787dbbb934621 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 347, y: 1205} + spritePosition: {x: 238, y: 50} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 583 + y: 676 + width: 335 + height: 178 + spriteID: 78e4fb9257ae969449274922d80c9542 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 583, y: 676} + spritePosition: {x: 213, y: 0} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1205 + width: 335 + height: 172 + spriteID: 06b67f5864345674998b5fffeca8f0c5 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1205} + spritePosition: {x: 56, y: 44} - name: HOUSED originalName: pivot: {x: 0.5, y: 0.5} @@ -357,8 +441,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 107 - y: 431 + x: 951 + y: 4 width: 50 height: 139 spriteID: e983054904c624d458502b406f781f28 @@ -369,7 +453,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: -372, y: 431} + uvTransform: {x: 472, y: 4} spritePosition: {x: 479, y: 0} - name: HOUSEE originalName: @@ -378,8 +462,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 165 - y: 431 + x: 885 + y: 1063 width: 65 height: 93 spriteID: c6a0d876e1e4f3843a8e76f5c1073f25 @@ -390,7 +474,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 165, y: 431} + uvTransform: {x: 885, y: 1063} spritePosition: {x: 554, y: 0} - name: HOUSEF originalName: @@ -399,8 +483,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1877 - y: 322 + x: 951 + y: 151 width: 49 height: 60 spriteID: 36c52e71f3120b742b793d13c21fc764 @@ -411,8 +495,50 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1877, y: 315} + uvTransform: {x: 951, y: 144} spritePosition: {x: 379, y: 61} + - name: "\u4E2D\u8FDC\u666F1" + originalName: + pivot: {x: 0.5, y: 0} + alignment: 7 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1063 + width: 714 + height: 134 + spriteID: ea8adb8011d433b49915124dcd6ce0be + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1063} + spritePosition: {x: 0, y: 0} + - name: "\u4E2D\u8FDC\u666F2" + originalName: + pivot: {x: 0.5, y: 0} + alignment: 7 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 900 + width: 709 + height: 155 + spriteID: 3f410a04ea297fe478cd08aa147831d6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 900} + spritePosition: {x: 5, y: 0} - name: HOUSEH originalName: pivot: {x: 0.5, y: 0.5} @@ -421,7 +547,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 391 + y: 1574 width: 711 height: 32 spriteID: c227cd041d1aaee40a334b9c352d1e8f @@ -432,7 +558,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 391} + uvTransform: {x: 4, y: 1574} spritePosition: {x: 3, y: 60} - name: "\u6700\u8FDC" originalName: @@ -441,8 +567,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1443 - y: 228 + x: 669 + y: 1205 width: 314 height: 77 spriteID: 5452e6ae00e46f14685e5d96f6a450dc @@ -453,7 +579,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1443, y: 228} + uvTransform: {x: 669, y: 1205} spritePosition: {x: 233, y: 47} - name: night originalName: @@ -462,8 +588,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 726 - y: 4 + x: 4 + y: 228 width: 714 height: 216 spriteID: 774e1b8183173464993208cbdb159195 @@ -474,7 +600,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 726, y: 4} + uvTransform: {x: 4, y: 228} spritePosition: {x: 0, y: 0} rigSpriteImportData: - name: langanA @@ -931,12 +1057,24 @@ ScriptedImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 androidETC2FallbackOverride: 0 + - name: iPhone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 mosaicLayers: 1 characterMode: 0 documentPivot: {x: 0, y: 0} documentAlignment: 7 importHiddenLayers: 0 - layerMappingOption: 2 + layerMappingOption: 0 generatePhysicsShape: 0 paperDollMode: 0 keepDupilcateSpriteName: 1 @@ -954,7 +1092,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 7f00581e6aec6514abef66a067f114b8 layerID: 17 - mosaicPosition: {x: 2035, y: 4} + mosaicPosition: {x: 1004, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -964,7 +1102,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 2a4be9d138b35ac4ebc352c8dbf21d86 layerID: 16 - mosaicPosition: {x: 4, y: 618} + mosaicPosition: {x: 981, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -974,7 +1112,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 16c9bd1958d4bf84bb04455a10102eb5 layerID: 15 - mosaicPosition: {x: 238, y: 431} + mosaicPosition: {x: 958, y: 1063} flatten: 0 isImported: 1 isVisible: 1 @@ -984,7 +1122,7 @@ ScriptedImporter: parentIndex: -1 spriteID: b4edb79b94269db4dbbce17ad9baeec9 layerID: 14 - mosaicPosition: {x: 1448, y: 4} + mosaicPosition: {x: 619, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -1004,7 +1142,7 @@ ScriptedImporter: parentIndex: -1 spriteID: f29cb16cad2eb964d81fbd5971c78603 layerID: 12 - mosaicPosition: {x: 1877, y: 228} + mosaicPosition: {x: 726, y: 1063} flatten: 0 isImported: 1 isVisible: 1 @@ -1014,7 +1152,7 @@ ScriptedImporter: parentIndex: -1 spriteID: acc60e2ae82b9a84c93d3fb125b5e681 layerID: 11 - mosaicPosition: {x: 1923, y: 4} + mosaicPosition: {x: 839, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1024,7 +1162,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 57a3f1121ec417f49a7288455d041a6c layerID: 10 - mosaicPosition: {x: 1810, y: 4} + mosaicPosition: {x: 726, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1034,7 +1172,7 @@ ScriptedImporter: parentIndex: -1 spriteID: e55213c6cc135c04a9ff3c4b2025d156 layerID: 9 - mosaicPosition: {x: 4, y: 431} + mosaicPosition: {x: 726, y: 228} flatten: 0 isImported: 1 isVisible: 1 @@ -1044,7 +1182,97 @@ ScriptedImporter: parentIndex: -1 spriteID: fb11cbcde54a8ce458adf645545f242c layerID: 8 - mosaicPosition: {x: 1765, y: 228} + mosaicPosition: {x: 829, y: 228} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSEAA + spriteName: HOUSEAA + isGroup: 0 + parentIndex: -1 + spriteID: e741c60680409014e8b4d64080434c77 + layerID: 72 + mosaicPosition: {x: 4, y: 676} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSEBB + spriteName: HOUSEBB + isGroup: 0 + parentIndex: -1 + spriteID: e1e9dc58e64ec9543bdd6e05914c0317 + layerID: 71 + mosaicPosition: {x: 4, y: 452} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + isGroup: 0 + parentIndex: -1 + spriteID: fad40253f6cd8ab4884ae7d6ed9c96dd + layerID: 70 + mosaicPosition: {x: 4, y: 1385} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + isGroup: 0 + parentIndex: -1 + spriteID: 6fc485874b504224189787dbbb934621 + layerID: 69 + mosaicPosition: {x: 347, y: 1205} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + isGroup: 0 + parentIndex: -1 + spriteID: 78e4fb9257ae969449274922d80c9542 + layerID: 68 + mosaicPosition: {x: 583, y: 676} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + isGroup: 0 + parentIndex: -1 + spriteID: 06b67f5864345674998b5fffeca8f0c5 + layerID: 67 + mosaicPosition: {x: 4, y: 1205} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSED + spriteName: HOUSED + isGroup: 0 + parentIndex: -1 + spriteID: e983054904c624d458502b406f781f28 + layerID: 7 + mosaicPosition: {x: 951, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSEE + spriteName: HOUSEE + isGroup: 0 + parentIndex: -1 + spriteID: c6a0d876e1e4f3843a8e76f5c1073f25 + layerID: 6 + mosaicPosition: {x: 885, y: 1063} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSEF + spriteName: HOUSEF + isGroup: 0 + parentIndex: -1 + spriteID: 36c52e71f3120b742b793d13c21fc764 + layerID: 5 + mosaicPosition: {x: 951, y: 151} flatten: 0 isImported: 1 isVisible: 1 @@ -1061,50 +1289,20 @@ ScriptedImporter: - name: "\u4E2D\u8FDC\u666F1" spriteName: "\u4E2D\u8FDC\u666F1" isGroup: 0 - parentIndex: 10 + parentIndex: 19 spriteID: ea8adb8011d433b49915124dcd6ce0be layerID: 48 - mosaicPosition: {x: 721, y: 228} + mosaicPosition: {x: 4, y: 1063} flatten: 0 isImported: 1 isVisible: 1 - name: "\u4E2D\u8FDC\u666F2" spriteName: "\u4E2D\u8FDC\u666F2" isGroup: 0 - parentIndex: 10 + parentIndex: 19 spriteID: 3f410a04ea297fe478cd08aa147831d6 layerID: 65 - mosaicPosition: {x: 4, y: 228} - flatten: 0 - isImported: 1 - isVisible: 1 - - name: HOUSED - spriteName: HOUSED - isGroup: 0 - parentIndex: 10 - spriteID: e983054904c624d458502b406f781f28 - layerID: 7 - mosaicPosition: {x: 107, y: 431} - flatten: 0 - isImported: 1 - isVisible: 1 - - name: HOUSEE - spriteName: HOUSEE - isGroup: 0 - parentIndex: 10 - spriteID: c6a0d876e1e4f3843a8e76f5c1073f25 - layerID: 6 - mosaicPosition: {x: 165, y: 431} - flatten: 0 - isImported: 1 - isVisible: 1 - - name: HOUSEF - spriteName: HOUSEF - isGroup: 0 - parentIndex: 10 - spriteID: 36c52e71f3120b742b793d13c21fc764 - layerID: 5 - mosaicPosition: {x: 1877, y: 322} + mosaicPosition: {x: 4, y: 900} flatten: 0 isImported: 1 isVisible: 1 @@ -1114,7 +1312,7 @@ ScriptedImporter: parentIndex: -1 spriteID: c227cd041d1aaee40a334b9c352d1e8f layerID: 4 - mosaicPosition: {x: 4, y: 391} + mosaicPosition: {x: 4, y: 1574} flatten: 0 isImported: 1 isVisible: 1 @@ -1124,7 +1322,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 5452e6ae00e46f14685e5d96f6a450dc layerID: 3 - mosaicPosition: {x: 1443, y: 228} + mosaicPosition: {x: 669, y: 1205} flatten: 0 isImported: 1 isVisible: 1 @@ -1134,7 +1332,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 774e1b8183173464993208cbdb159195 layerID: 2 - mosaicPosition: {x: 726, y: 4} + mosaicPosition: {x: 4, y: 228} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/GameContent/Scene_Subway/Art/白天窗外.psd b/Assets/GameContent/Scene_Subway/Art/白天窗外.psd index 6ee77f288..d7fe656c9 100644 --- a/Assets/GameContent/Scene_Subway/Art/白天窗外.psd +++ b/Assets/GameContent/Scene_Subway/Art/白天窗外.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15ddec8804c7b0aedb585d00968fb6d192d8da0ce67da9b9f5b359af2b90bcc3 -size 981508 +oid sha256:4f18fa41cfa8b05fa7b7aae9eb1fd75fe6c29c4431818235190157e9c016a867 +size 1910077 diff --git a/Assets/GameContent/Scene_Subway/Art/白天窗外.psd.meta b/Assets/GameContent/Scene_Subway/Art/白天窗外.psd.meta index c0244ec80..9ee252660 100644 --- a/Assets/GameContent/Scene_Subway/Art/白天窗外.psd.meta +++ b/Assets/GameContent/Scene_Subway/Art/白天窗外.psd.meta @@ -98,7 +98,7 @@ ScriptedImporter: uvTransform: {x: 0, y: 0} spritePosition: {x: 0, y: 0} mosaicSpriteImportData: - - name: "\u8F66\u53A2" + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50D" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -106,10 +106,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 4 - width: 714 - height: 216 - spriteID: 5f610e4ac9adea34bb85cd3d9d5dddda + y: 1385 + width: 314 + height: 181 + spriteID: 326b3381c8251f247a9337314be7c939 spriteBone: [] spriteOutline: [] vertices: [] @@ -117,8 +117,113 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 4} - spritePosition: {x: 0, y: 0} + uvTransform: {x: 4, y: 1385} + spritePosition: {x: 246, y: 0} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 347 + y: 1205 + width: 314 + height: 166 + spriteID: 28e4de919d43ffe4695551d9861707b4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 347, y: 1205} + spritePosition: {x: 238, y: 50} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 583 + y: 676 + width: 335 + height: 178 + spriteID: d4d109d907b9cee4590485b573784168 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 583, y: 676} + spritePosition: {x: 213, y: 0} + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1205 + width: 335 + height: 172 + spriteID: 9e431bf83dcfa724796915ed56f3324d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1205} + spritePosition: {x: 56, y: 44} + - name: HOUSEAA + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 676 + width: 571 + height: 216 + spriteID: ff7a4d912fba81a47825f148695e6abf + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: -28, y: 676} + spritePosition: {x: 32, y: 0} + - name: HOUSEBB + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 452 + width: 607 + height: 216 + spriteID: 73228f6be0949c64da88a91805555764 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 452} + spritePosition: {x: 37, y: 0} - name: "\u4E2D\u8FDC\u666F1" originalName: pivot: {x: 0.5, y: 0} @@ -127,7 +232,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 452 + y: 1063 width: 714 height: 134 spriteID: b454ba8f586d51448ab87d2addc39137 @@ -138,7 +243,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 452} + uvTransform: {x: 4, y: 1063} spritePosition: {x: 0, y: 0} - name: langanA originalName: @@ -147,8 +252,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2035 - y: 4 + x: 1004 + y: 452 width: 6 height: 206 spriteID: af56e5eafa1feb449a8a8e4fa00b64e0 @@ -159,7 +264,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2035, y: 4} + uvTransform: {x: 1004, y: 452} spritePosition: {x: 483, y: 10} - name: langanB originalName: @@ -168,8 +273,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 594 + x: 981 + y: 452 width: 15 height: 209 spriteID: 5fd83153a7a95f84ea976fd0d934a403 @@ -180,7 +285,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 594} + uvTransform: {x: 981, y: 452} spritePosition: {x: 271, y: 7} - name: "\u5E7F\u544A\u724C" originalName: @@ -189,8 +294,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1675 - y: 313 + x: 885 + y: 1063 width: 35 height: 72 spriteID: eadd51af835b5e4409105c4cb5dd0e8a @@ -201,7 +306,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1675, y: 313} + uvTransform: {x: 885, y: 1063} spritePosition: {x: 276, y: 49} - name: HOUSEA originalName: @@ -210,8 +315,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1448 - y: 4 + x: 619 + y: 452 width: 354 height: 216 spriteID: 8b245782b095d77409dbba50d8e8b044 @@ -222,7 +327,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1448, y: 4} + uvTransform: {x: 619, y: 452} spritePosition: {x: 360, y: 0} - name: HOUSEB originalName: @@ -231,7 +336,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 726 + x: 4 y: 4 width: 714 height: 216 @@ -243,7 +348,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 726, y: 4} + uvTransform: {x: 4, y: 4} spritePosition: {x: 0, y: 0} - name: "\u8349\u8393\u673A\u6CB9" originalName: @@ -252,8 +357,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1443 - y: 313 + x: 726 + y: 1063 width: 151 height: 86 spriteID: 92964744ea39ced41aa991818d7d2653 @@ -264,7 +369,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1443, y: 313} + uvTransform: {x: 726, y: 1063} spritePosition: {x: 329, y: 59} - name: "\u79D1\u5B66\u697CA" originalName: @@ -273,7 +378,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1923 + x: 839 y: 4 width: 104 height: 170 @@ -285,7 +390,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1923, y: 4} + uvTransform: {x: 839, y: 4} spritePosition: {x: 490, y: 0} - name: "\u79D1\u5B66\u697CB" originalName: @@ -294,7 +399,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1810 + x: 726 y: 4 width: 105 height: 183 @@ -306,7 +411,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1810, y: 4} + uvTransform: {x: 726, y: 4} spritePosition: {x: 218, y: 4} - name: "\u6469\u5929\u5927\u697C" originalName: @@ -315,7 +420,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1765 + x: 726 y: 228 width: 95 height: 179 @@ -327,7 +432,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1765, y: 228} + uvTransform: {x: 726, y: 228} spritePosition: {x: 367, y: 0} - name: HOUSEC originalName: @@ -336,7 +441,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1868 + x: 829 y: 228 width: 104 height: 144 @@ -348,7 +453,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1868, y: 228} + uvTransform: {x: 829, y: 228} spritePosition: {x: 519, y: 0} - name: "\u4E2D\u8FDC\u666F2" originalName: @@ -357,8 +462,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 726 - y: 228 + x: 4 + y: 900 width: 709 height: 155 spriteID: edd8bca9cfcfd3c46a074a0656a3b7d1 @@ -369,71 +474,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 721, y: 228} + uvTransform: {x: -1, y: 900} spritePosition: {x: 5, y: 0} - - name: HOUSEF - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 1980 - y: 375 - width: 49 - height: 60 - spriteID: bd631d02dd79c674c867df96c8d576d6 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 1980, y: 375} - spritePosition: {x: 379, y: 61} - - name: HOUSED - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 1980 - y: 228 - width: 50 - height: 139 - spriteID: bfe6acd951c0df147aa0bc09784ba0f6 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 1980, y: 228} - spritePosition: {x: 479, y: 0} - - name: HOUSEE - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 1602 - y: 313 - width: 65 - height: 127 - spriteID: b50f8e3f83c3fe24d8c0f78079893fea - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 1602, y: 313} - spritePosition: {x: 431, y: 4} - name: HOUSEH originalName: pivot: {x: 0.5, y: 0.5} @@ -441,8 +483,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 726 - y: 452 + x: 4 + y: 1574 width: 711 height: 32 spriteID: 57482caf1a442154c898e89a22d33b9d @@ -453,7 +495,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 726, y: 452} + uvTransform: {x: 4, y: 1574} spritePosition: {x: 3, y: 60} - name: "\u6700\u8FDC" originalName: @@ -462,8 +504,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1443 - y: 228 + x: 669 + y: 1205 width: 314 height: 77 spriteID: a4bf9888d3d40c041a9be80573cce80e @@ -474,7 +516,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1443, y: 228} + uvTransform: {x: 669, y: 1205} spritePosition: {x: 233, y: 47} - name: sun originalName: @@ -483,8 +525,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1675 - y: 393 + x: 885 + y: 1143 width: 16 height: 17 spriteID: 85e8632e2a0f9f643a8c20c06694dcff @@ -495,7 +537,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1675, y: 393} + uvTransform: {x: 885, y: 1143} spritePosition: {x: 417, y: 83} - name: day originalName: @@ -952,12 +994,24 @@ ScriptedImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 androidETC2FallbackOverride: 0 + - name: iPhone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 mosaicLayers: 1 characterMode: 0 documentPivot: {x: 0, y: 0} documentAlignment: 0 importHiddenLayers: 0 - layerMappingOption: 2 + layerMappingOption: 0 generatePhysicsShape: 0 paperDollMode: 0 keepDupilcateSpriteName: 1 @@ -969,6 +1023,66 @@ ScriptedImporter: spritePackingTag: resliceFromLayer: 1 mosaicPSDLayers: + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + isGroup: 0 + parentIndex: -1 + spriteID: 326b3381c8251f247a9337314be7c939 + layerID: 90 + mosaicPosition: {x: 4, y: 1385} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + isGroup: 0 + parentIndex: -1 + spriteID: 28e4de919d43ffe4695551d9861707b4 + layerID: 89 + mosaicPosition: {x: 347, y: 1205} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + isGroup: 0 + parentIndex: -1 + spriteID: d4d109d907b9cee4590485b573784168 + layerID: 88 + mosaicPosition: {x: 583, y: 676} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + spriteName: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + isGroup: 0 + parentIndex: -1 + spriteID: 9e431bf83dcfa724796915ed56f3324d + layerID: 87 + mosaicPosition: {x: 4, y: 1205} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSEAA + spriteName: HOUSEAA + isGroup: 0 + parentIndex: -1 + spriteID: ff7a4d912fba81a47825f148695e6abf + layerID: 86 + mosaicPosition: {x: 4, y: 676} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: HOUSEBB + spriteName: HOUSEBB + isGroup: 0 + parentIndex: -1 + spriteID: 73228f6be0949c64da88a91805555764 + layerID: 85 + mosaicPosition: {x: 4, y: 452} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u8F66\u53A2" spriteName: "\u8F66\u53A2" isGroup: 0 @@ -977,15 +1091,15 @@ ScriptedImporter: layerID: 50 mosaicPosition: {x: 4, y: 4} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u4E2D\u8FDC\u666F1" spriteName: "\u4E2D\u8FDC\u666F1" isGroup: 0 parentIndex: -1 spriteID: b454ba8f586d51448ab87d2addc39137 layerID: 30 - mosaicPosition: {x: 4, y: 452} + mosaicPosition: {x: 4, y: 1063} flatten: 0 isImported: 1 isVisible: 1 @@ -995,7 +1109,7 @@ ScriptedImporter: parentIndex: -1 spriteID: af56e5eafa1feb449a8a8e4fa00b64e0 layerID: 18 - mosaicPosition: {x: 2035, y: 4} + mosaicPosition: {x: 1004, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -1005,7 +1119,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 5fd83153a7a95f84ea976fd0d934a403 layerID: 17 - mosaicPosition: {x: 4, y: 594} + mosaicPosition: {x: 981, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -1015,7 +1129,7 @@ ScriptedImporter: parentIndex: -1 spriteID: eadd51af835b5e4409105c4cb5dd0e8a layerID: 16 - mosaicPosition: {x: 1675, y: 313} + mosaicPosition: {x: 885, y: 1063} flatten: 0 isImported: 1 isVisible: 1 @@ -1025,7 +1139,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 8b245782b095d77409dbba50d8e8b044 layerID: 15 - mosaicPosition: {x: 1448, y: 4} + mosaicPosition: {x: 619, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -1035,7 +1149,7 @@ ScriptedImporter: parentIndex: -1 spriteID: d5684b242981c7649be72cb1bb5a7f47 layerID: 14 - mosaicPosition: {x: 726, y: 4} + mosaicPosition: {x: 4, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1045,7 +1159,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 92964744ea39ced41aa991818d7d2653 layerID: 13 - mosaicPosition: {x: 1443, y: 313} + mosaicPosition: {x: 726, y: 1063} flatten: 0 isImported: 1 isVisible: 1 @@ -1055,7 +1169,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 8583562e28f96614ba41f601c2c162b0 layerID: 12 - mosaicPosition: {x: 1923, y: 4} + mosaicPosition: {x: 839, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1065,7 +1179,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 375612e6ad88cc24d8888579ce998961 layerID: 11 - mosaicPosition: {x: 1810, y: 4} + mosaicPosition: {x: 726, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1075,7 +1189,7 @@ ScriptedImporter: parentIndex: -1 spriteID: b21abb737289195488656f222ca00d02 layerID: 10 - mosaicPosition: {x: 1765, y: 228} + mosaicPosition: {x: 726, y: 228} flatten: 0 isImported: 1 isVisible: 1 @@ -1085,7 +1199,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 3f310c4f02dd216449acd2adf389d036 layerID: 9 - mosaicPosition: {x: 1868, y: 228} + mosaicPosition: {x: 829, y: 228} flatten: 0 isImported: 1 isVisible: 1 @@ -1095,7 +1209,7 @@ ScriptedImporter: parentIndex: -1 spriteID: edd8bca9cfcfd3c46a074a0656a3b7d1 layerID: 80 - mosaicPosition: {x: 726, y: 228} + mosaicPosition: {x: 4, y: 900} flatten: 0 isImported: 1 isVisible: 1 @@ -1108,36 +1222,36 @@ ScriptedImporter: mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 1 + isVisible: 0 - name: HOUSEF spriteName: HOUSEF isGroup: 0 - parentIndex: 13 + parentIndex: 19 spriteID: bd631d02dd79c674c867df96c8d576d6 layerID: 6 mosaicPosition: {x: 1980, y: 375} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: HOUSED spriteName: HOUSED isGroup: 0 - parentIndex: 13 + parentIndex: 19 spriteID: bfe6acd951c0df147aa0bc09784ba0f6 layerID: 8 mosaicPosition: {x: 1980, y: 228} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: HOUSEE spriteName: HOUSEE isGroup: 0 - parentIndex: 13 + parentIndex: 19 spriteID: b50f8e3f83c3fe24d8c0f78079893fea layerID: 7 mosaicPosition: {x: 1602, y: 313} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: HOUSEH spriteName: HOUSEH @@ -1145,7 +1259,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 57482caf1a442154c898e89a22d33b9d layerID: 5 - mosaicPosition: {x: 726, y: 452} + mosaicPosition: {x: 4, y: 1574} flatten: 0 isImported: 1 isVisible: 1 @@ -1155,7 +1269,7 @@ ScriptedImporter: parentIndex: -1 spriteID: a4bf9888d3d40c041a9be80573cce80e layerID: 4 - mosaicPosition: {x: 1443, y: 228} + mosaicPosition: {x: 669, y: 1205} flatten: 0 isImported: 1 isVisible: 1 @@ -1165,7 +1279,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 85e8632e2a0f9f643a8c20c06694dcff layerID: 3 - mosaicPosition: {x: 1675, y: 393} + mosaicPosition: {x: 885, y: 1143} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/GameContent/Scene_Subway/Art/相错列车.png b/Assets/GameContent/Scene_Subway/Art/相错列车.png new file mode 100644 index 000000000..8705f0cfa --- /dev/null +++ b/Assets/GameContent/Scene_Subway/Art/相错列车.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcedf134760b7e0ee314e3bbdbedab720c65a789e1b7b3052a35707a45346844 +size 368568 diff --git a/Assets/GameContent/Scene_Subway/Art/相错列车.png.meta b/Assets/GameContent/Scene_Subway/Art/相错列车.png.meta new file mode 100644 index 000000000..72394bb6c --- /dev/null +++ b/Assets/GameContent/Scene_Subway/Art/相错列车.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 66be33a1bdb16ee409c6ac05b61e08a7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 21.5 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 08b517ec3..87a7c5f5f 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1068,8 +1068,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4285895836 - m_fontColor: {r: 0.6117647, g: 0.5803922, b: 0.45882353, a: 1} + rgba: 2104857756 + m_fontColor: {r: 0.6117647, g: 0.5803922, b: 0.45882353, a: 0.49019608} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3414,8 +3414,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 60.3} - m_SizeDelta: {x: 800, y: 640} + m_AnchoredPosition: {x: -15.2, y: 75.1} + m_SizeDelta: {x: 750, y: 560} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1133910972 MonoBehaviour: @@ -3437,7 +3437,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 3590298006132234197, guid: 73def603ca61b39438ad172fd1536786, type: 3} + m_Sprite: {fileID: 1861404412343999680, guid: 73def603ca61b39438ad172fd1536786, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4325,26 +4325,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2124297928} m_Modifications: - - target: {fileID: 2423162426229031290, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2423162426229031290, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2423162426229031290, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_SizeDelta.x - value: 550 - objectReference: {fileID: 0} - - target: {fileID: 2423162426229031290, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2423162426229031290, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2574484533750850000, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4425,29 +4405,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2958623748108572242, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_fontSize - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 2958623748108572242, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_fontSizeBase - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 3870021013132421894, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_fontSize - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 3870021013132421894, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_fontSizeBase - value: 32 - objectReference: {fileID: 0} - target: {fileID: 6486490900672718768, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} propertyPath: m_Name value: TerminalHeader objectReference: {fileID: 0} - target: {fileID: 6824655648731073600, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} propertyPath: m_Color.a - value: 1 + value: 0.49019608 objectReference: {fileID: 0} - target: {fileID: 6824655648731073600, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} propertyPath: m_Color.b @@ -4462,20 +4426,8 @@ PrefabInstance: value: 0.6784314 objectReference: {fileID: 0} - target: {fileID: 8245004429010542764, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8245004429010542764, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8245004429010542764, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8245004429010542764, guid: fb2302730744f9a4c9ba13f2016969e5, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + propertyPath: m_SizeDelta.x + value: 210 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -6787,7 +6739,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124297927} m_Enabled: 1 - m_Alpha: 0.7 + m_Alpha: 0.6 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 @@ -7264,8 +7216,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4285237156 - m_fontColor: {r: 0.6431373, g: 0.5294118, b: 0.41960788, a: 1} + rgba: 2104199076 + m_fontColor: {r: 0.6431373, g: 0.5294118, b: 0.41960788, a: 0.49019608} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -7405,7 +7357,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -340} - m_SizeDelta: {x: 591.84, y: 60} + m_SizeDelta: {x: 591.74, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3224902310437709222 GameObject: diff --git a/Assets/Scenes/SubWay.unity b/Assets/Scenes/SubWay.unity index 2679da828..f25231dae 100644 --- a/Assets/Scenes/SubWay.unity +++ b/Assets/Scenes/SubWay.unity @@ -123,6 +123,73 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &6396185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6396186} + - component: {fileID: 6396188} + m_Layer: 0 + m_Name: "\u5217\u8F66" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6396186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6396185} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 30, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441612920} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6396188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6396185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36a82fb65d2d45a8a6ce391835134c22, type: 3} + m_Name: + m_EditorClassIdentifier: + mobileObjectDatas: + - itemName: "\u5217\u8F66" + direction: {x: -1, y: 0} + speed: {x: 100, y: 100} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u76F8\u9519\u5217\u8F66" + offset: {x: 0, y: 0} + sortingLayerId: 1560193523 + sortingOrder: 100 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + playOnAwake: 1 + initMode: 1 + isDistanceMode: 1 + existTime: 0 + existDistance: 50 + intervalRange: {x: 120, y: 200} --- !u!1 &11266074 GameObject: m_ObjectHideFlags: 3 @@ -626,7 +693,7 @@ MonoBehaviour: - "Subway/\u767D\u5929\u7A97\u5916[HOUSEB]" offset: {x: 0, y: 0} sortingLayerId: 1560193523 - sortingOrder: 47 + sortingOrder: 90 isDistanceMode: 0 existTime: 0 existDistance: 0 @@ -642,7 +709,39 @@ MonoBehaviour: - "Subway/\u767D\u5929\u7A97\u5916[HOUSEA]" offset: {x: 0, y: 0} sortingLayerId: 1560193523 - sortingOrder: 90 + sortingOrder: 47 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + - itemName: "\u8FD1\u666F\u697C\u623F3" + direction: {x: -1, y: 0} + speed: {x: 60, y: 60} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[HOUSEAA]" + offset: {x: 0, y: 0} + sortingLayerId: 1560193523 + sortingOrder: 47 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + - itemName: "\u8FD1\u666F\u697C\u623F4" + direction: {x: -1, y: 0} + speed: {x: 60, y: 60} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[HOUSEBB]" + offset: {x: 0, y: 0} + sortingLayerId: 1560193523 + sortingOrder: 47 isDistanceMode: 0 existTime: 0 existDistance: 0 @@ -678,6 +777,12 @@ MonoBehaviour: - itemName: "\u8FD1\u666F\u697C\u623F2" assetAddressArray: - "Subway/\u767D\u5929\u7A97\u5916[HOUSEA]" + - itemName: "\u8FD1\u666F\u697C\u623F3" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[HOUSEAA]" + - itemName: "\u8FD1\u666F\u697C\u623F4" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[HOUSEBB]" - time: 2 weather: 0 mobileAddressData: @@ -687,6 +792,12 @@ MonoBehaviour: - itemName: "\u8FD1\u666F\u697C\u623F2" assetAddressArray: - "Subway/\u591C\u665A\u7A97\u5916[HOUSEA]" + - itemName: "\u8FD1\u666F\u697C\u623F3" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[HOUSEAA]" + - itemName: "\u8FD1\u666F\u697C\u623F4" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[HOUSEBB]" --- !u!1 &233946547 GameObject: m_ObjectHideFlags: 0 @@ -1122,14 +1233,14 @@ MonoBehaviour: mobileObjectDatas: - itemName: "\u5E7F\u544A\u724C" direction: {x: -1, y: 0} - speed: {x: 40, y: 40} + speed: {x: 10, y: 10} mobileType: 1 maskInteraction: 0 assetAddressArray: - "Subway/\u767D\u5929\u7A97\u5916[\u5E7F\u544A\u724C]" offset: {x: 0, y: -1.069767} sortingLayerId: 1560193523 - sortingOrder: 48 + sortingOrder: 25 isDistanceMode: 0 existTime: 0 existDistance: 0 @@ -1141,7 +1252,7 @@ MonoBehaviour: isDistanceMode: 1 existTime: 0 existDistance: 50 - intervalRange: {x: 5, y: 10} + intervalRange: {x: 20, y: 20} --- !u!114 &380972590 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1196,10 +1307,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6396186} - {fileID: 1083043496} - {fileID: 1425559488} - {fileID: 380972588} - {fileID: 226184626} + - {fileID: 1390069803} - {fileID: 1254024539} - {fileID: 1597021227} - {fileID: 1364179053} @@ -2396,7 +2509,7 @@ MonoBehaviour: mobileType: 1 maskInteraction: 0 assetAddressArray: - - "Subway/\u767D\u5929\u7A97\u5916[langanB]" + - "Subway/\u767D\u5929\u7A97\u5916[langanA]" offset: {x: 0, y: 0} sortingLayerId: 1560193523 sortingOrder: 50 @@ -2430,14 +2543,12 @@ MonoBehaviour: mobileAddressData: - itemName: "\u680F\u6746" assetAddressArray: - - "Subway/\u767D\u5929\u7A97\u5916[langanB]" - "Subway/\u767D\u5929\u7A97\u5916[langanA]" - time: 2 weather: 0 mobileAddressData: - itemName: "\u680F\u6746" assetAddressArray: - - "Subway/\u591C\u665A\u7A97\u5916[langanB]" - "Subway/\u591C\u665A\u7A97\u5916[langanA]" --- !u!1 &1083958585 GameObject: @@ -2897,6 +3008,166 @@ Transform: - {fileID: 1852431471} m_Father: {fileID: 975479658} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1390069802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1390069803} + - component: {fileID: 1390069805} + - component: {fileID: 1390069804} + m_Layer: 0 + m_Name: "\u4E2D\u8FD1\u666F\u623F\u5B50" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1390069803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1390069802} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 35, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441612920} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1390069804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1390069802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2973f622187142fd9230396685c3fdf6, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnerPartAssets: + - time: 0 + weather: 0 + mobileAddressData: + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50A]" + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50B]" + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50C]" + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50D]" + - time: 2 + weather: 0 + mobileAddressData: + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50A]" + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50B]" + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50C]" + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50D]" +--- !u!114 &1390069805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1390069802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f8dbbddeadc43158db470f2e9bb1a09, type: 3} + m_Name: + m_EditorClassIdentifier: + mobileObjectDatas: + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50A" + direction: {x: -1, y: 0} + speed: {x: 10, y: 10} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50A]" + offset: {x: 0, y: -1} + sortingLayerId: 1560193523 + sortingOrder: 24 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50B" + direction: {x: -1, y: 0} + speed: {x: 10, y: 10} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50B]" + offset: {x: 0, y: -0.83} + sortingLayerId: 1560193523 + sortingOrder: 24 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50C" + direction: {x: -1, y: 0} + speed: {x: 10, y: 10} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50A]" + offset: {x: 0, y: -1.12} + sortingLayerId: 1560193523 + sortingOrder: 24 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + - itemName: "\u4E2D\u8FD1\u666F\u623F\u5B50D" + direction: {x: -1, y: 0} + speed: {x: 10, y: 10} + mobileType: 1 + maskInteraction: 0 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[\u4E2D\u8FD1\u666F\u623F\u5B50D]" + offset: {x: 0, y: -0.75} + sortingLayerId: 1560193523 + sortingOrder: 24 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + playOnAwake: 0 + initMode: 1 + isDistanceMode: 1 + existTime: 0 + existDistance: 60 + intervalRange: {x: 4, y: 7} + batchInterval: {x: 4, y: 7} --- !u!1 &1425559487 GameObject: m_ObjectHideFlags: 0 @@ -2949,14 +3220,12 @@ MonoBehaviour: - itemName: "\u680F\u6746" assetAddressArray: - "Subway/\u767D\u5929\u7A97\u5916[langanB]" - - "Subway/\u767D\u5929\u7A97\u5916[langanA]" - time: 2 weather: 0 mobileAddressData: - itemName: "\u680F\u6746" assetAddressArray: - "Subway/\u591C\u665A\u7A97\u5916[langanB]" - - "Subway/\u591C\u665A\u7A97\u5916[langanA]" --- !u!114 &1425559490 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2972,11 +3241,11 @@ MonoBehaviour: mobileObjectDatas: - itemName: "\u680F\u6746" direction: {x: -1, y: 0} - speed: {x: 70, y: 70} + speed: {x: 60, y: 60} mobileType: 1 maskInteraction: 0 assetAddressArray: - - "Subway/\u767D\u5929\u7A97\u5916[langanA]" + - "Subway/\u767D\u5929\u7A97\u5916[langanB]" offset: {x: 0, y: 0} sortingLayerId: 1560193523 sortingOrder: 50 @@ -2991,7 +3260,7 @@ MonoBehaviour: isDistanceMode: 1 existTime: 0 existDistance: 50 - intervalRange: {x: 5, y: 5} + intervalRange: {x: 10, y: 10} --- !u!1 &1521980648 GameObject: m_ObjectHideFlags: 0