diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png index 17e3a70fa9..86c6b5f56a 100644 Binary files a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png and b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png.meta index ee272109af..e0466b848b 100644 --- a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png.meta +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7548c6c2d59db82429cbe8500b1b83f0 +guid: bee77bdec9500c3408583877168d9e41 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: ff17fbe97a156fd4a9eb1b0117b9b6c6 + spriteID: d7bbe86c4255b7a4d9ee7c9308377602 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png index b08e489a67..b016d909fd 100644 Binary files a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png and b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png.meta index 3d60e1fa05..ef1e3d41a9 100644 --- a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png.meta +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c7b6b9d723205147b475652d942bc6f +guid: a16aaea4369c2bc448b8a255ec43cdd2 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 437be34ba4931414298bf621fdc8d56c + spriteID: 7a80235db73c2e945b962dd212e90337 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png index b158c3b944..f08608a207 100644 Binary files a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png and b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png.meta index c92ae7f8b6..f6df138129 100644 --- a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png.meta +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_03.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7df540e067f2586488978c5d5afb56be +guid: cd29b6e0a96eeae40862354b3ba783c2 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 2cebd7d28e26d8b4ead93030dbe00b42 + spriteID: 1565d9af7e4318349beb46203ba80f71 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png index a499e0d116..33647c9dc0 100644 Binary files a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png and b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png.meta index 525a7d6d8e..1606c68c2d 100644 --- a/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png.meta +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/s_shenhunxitong_zhiyexiaobiao_04.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05123e6e61c3e824db0161f043ecc67f +guid: 73f32603bed5a134387f30024b17eb41 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 247584492bfc9754bb3df14d6699605b + spriteID: 1eac2f567be29064cae8ebabe8fd93e0 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index f7424a03ea..07f9f7acd8 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -7216,8 +7216,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 28.500002, y: 28.999989} - m_SizeDelta: {x: 51.66, y: 51.67} + m_AnchoredPosition: {x: 31.000002, y: 30.999989} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2985862884813520727 CanvasRenderer: @@ -11824,8 +11824,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 28.5, y: -29} - m_SizeDelta: {x: 57, y: 58} + m_AnchoredPosition: {x: 31, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3366739036116014475 CanvasRenderer: @@ -17321,7 +17321,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -2295.5, y: -405.15002} - m_SizeDelta: {x: 67, y: 58} + m_SizeDelta: {x: 72, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2085220266436213419 MonoBehaviour: @@ -19349,7 +19349,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5F53\u524D\u52A0\u6210" + m_Text: "\u4E00\u952E\u653E\u5165" --- !u!1 &6823618120496866411 GameObject: m_ObjectHideFlags: 0 @@ -22377,7 +22377,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 67, y: -29} + m_AnchoredPosition: {x: 72, y: -31} m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4579686295789554606 @@ -23451,7 +23451,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5F53\u524D\u52A0\u6210" + m_Text: "\u786E\u5B9A" --- !u!1 &8626664211375287488 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 9de414a60b..d9e9bffa82 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -119,14 +119,14 @@ RectTransform: - {fileID: 7243046732601692507} - {fileID: 1974363042441674858} - {fileID: 2025960690052971106} - - {fileID: 1973877883734817856} - {fileID: 4126197808121152527} - {fileID: 2338646928782581046} - {fileID: 5299528613146693474} - {fileID: 2913791122365382009} - {fileID: 458271444932364388} - - {fileID: 165381528669676981} - {fileID: 3260307931949129323} + - {fileID: 1973877883734817856} + - {fileID: 165381528669676981} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -259,7 +259,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1390,7 +1390,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 8 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1893,7 +1893,7 @@ RectTransform: - {fileID: 1956582454896893773} - {fileID: 260420168377369215} m_Father: {fileID: 164915241442772717} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1966,7 +1966,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2091,7 +2091,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2355,7 +2355,7 @@ RectTransform: - {fileID: 7502473627380909813} - {fileID: 8222799376925158843} m_Father: {fileID: 164915241442772717} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2498,7 +2498,7 @@ RectTransform: m_Children: - {fileID: 2359267268905386541} m_Father: {fileID: 164915241442772717} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -2647,7 +2647,7 @@ RectTransform: m_Children: - {fileID: 1873213904672093763} m_Father: {fileID: 164915241442772717} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab index a44d31f0d0..b885145f96 100644 --- a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab @@ -35,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.153496, y: 1.2465} + m_AnchoredPosition: {x: 110.139496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &8743653308438433369 @@ -332,7 +332,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48.660496, y: -6.7535} + m_AnchoredPosition: {x: 20.493, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818097329355 @@ -407,7 +407,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48.660496, y: 1.2465} + m_AnchoredPosition: {x: 48.660496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818242639341 @@ -704,7 +704,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.153496, y: -6.7535} + m_AnchoredPosition: {x: 40.986, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818590170636 @@ -1149,7 +1149,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 184, y: 12.5} + m_AnchoredPosition: {x: 219.465, y: 4.5} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818851291984 @@ -1298,7 +1298,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 28.167496, y: 1.2465} + m_AnchoredPosition: {x: 120.38599, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818902343616 @@ -1373,7 +1373,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 28.167496, y: -6.7535} + m_AnchoredPosition: {x: 0, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818921221044 @@ -1522,7 +1522,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.153496, y: 1.2465} + m_AnchoredPosition: {x: 69.153496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819123426389 @@ -1745,7 +1745,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110.139496, y: -6.7535} + m_AnchoredPosition: {x: 81.972, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819291926011 @@ -2198,7 +2198,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.6465, y: 1.2465} + m_AnchoredPosition: {x: 89.6465, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819610280430 @@ -2349,7 +2349,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 145, y: 12.5} + m_AnchoredPosition: {x: 180.465, y: 4.5} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819788793331 @@ -2424,7 +2424,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 59.899994, y: 4.5} + m_AnchoredPosition: {x: 102.465, y: 4.5} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819795124044 @@ -2499,7 +2499,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 45.899994, y: 16} + m_AnchoredPosition: {x: 0, y: 16} m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819818155162 @@ -2806,6 +2806,11 @@ RectTransform: - {fileID: 2320031819788793293} - {fileID: 2320031818851291986} - {fileID: 2320031820124984913} + - {fileID: 8137459246776515621} + - {fileID: 6546751699367335720} + - {fileID: 1133333780268927848} + - {fileID: 8833848101918479878} + - {fileID: 2327268691548940647} m_Father: {fileID: 2535060995107670383} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2880,7 +2885,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 223, y: 12.5} + m_AnchoredPosition: {x: 258.465, y: 4.5} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031820124984919 @@ -2955,7 +2960,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106, y: 12.5} + m_AnchoredPosition: {x: 141.465, y: 4.5} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031820163869941 @@ -3104,7 +3109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.6465, y: -6.7535} + m_AnchoredPosition: {x: 61.479, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031820211446152 @@ -3383,6 +3388,175 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2509557596053356189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4665799284036095233} + - component: {fileID: 5312127279028889697} + - component: {fileID: 5607311053634613583} + - component: {fileID: 4831715256516486541} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4665799284036095233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509557596053356189} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6546751699367335720} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -3.47} + m_SizeDelta: {x: 14.97, y: 37.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &5312127279028889697 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509557596053356189} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &5607311053634613583 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509557596053356189} + m_CullTransparentMesh: 0 +--- !u!114 &4831715256516486541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509557596053356189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &2599360275874779277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8137459246776515621} + - component: {fileID: 1204521523941111826} + - component: {fileID: 3908139703690127212} + m_Layer: 5 + m_Name: starPre (17) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8137459246776515621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2599360275874779277} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 893724708655446144} + m_Father: {fileID: 2320031820122894204} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 28.167496, y: -6.7535} + m_SizeDelta: {x: 32.493, y: 32.493} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1204521523941111826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2599360275874779277} + m_CullTransparentMesh: 0 +--- !u!114 &3908139703690127212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2599360275874779277} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3216826335513605147 GameObject: m_ObjectHideFlags: 0 @@ -3462,6 +3636,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 128 +--- !u!1 &3363849132302515497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8833848101918479878} + - component: {fileID: 6538529404677289810} + - component: {fileID: 7822646744323295349} + m_Layer: 5 + m_Name: starPre (21) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8833848101918479878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363849132302515497} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3538448680436227613} + m_Father: {fileID: 2320031820122894204} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 89.6465, y: -6.7535} + m_SizeDelta: {x: 32.493, y: 32.493} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6538529404677289810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363849132302515497} + m_CullTransparentMesh: 0 +--- !u!114 &7822646744323295349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363849132302515497} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3861246476698237326 GameObject: m_ObjectHideFlags: 0 @@ -3542,6 +3791,156 @@ MonoBehaviour: m_LineSpacing: 0.9 m_Text: "\u5965\u62C9\u897F\u65AF" LanguageIndex: 0 +--- !u!1 &4187443188038303559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2327268691548940647} + - component: {fileID: 3792623521938868203} + - component: {fileID: 9191265027528233695} + m_Layer: 5 + m_Name: starPre (20) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2327268691548940647 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187443188038303559} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1} + m_Children: + - {fileID: 2606431885992466539} + m_Father: {fileID: 2320031820122894204} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110.139496, y: -6.7535} + m_SizeDelta: {x: 32.493, y: 32.493} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3792623521938868203 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187443188038303559} + m_CullTransparentMesh: 0 +--- !u!114 &9191265027528233695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187443188038303559} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &4533347724957016511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6546751699367335720} + - component: {fileID: 8223094582038930833} + - component: {fileID: 6040717628695768360} + m_Layer: 5 + m_Name: starPre (18) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6546751699367335720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533347724957016511} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1} + m_Children: + - {fileID: 4665799284036095233} + m_Father: {fileID: 2320031820122894204} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 48.660496, y: -6.7535} + m_SizeDelta: {x: 32.493, y: 32.493} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8223094582038930833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533347724957016511} + m_CullTransparentMesh: 0 +--- !u!114 &6040717628695768360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533347724957016511} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4914193227855868971 GameObject: m_ObjectHideFlags: 0 @@ -3911,6 +4310,269 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6712245888695593137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 893724708655446144} + - component: {fileID: 4767970594039775338} + - component: {fileID: 6936316466172308003} + - component: {fileID: 8974435914228705921} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &893724708655446144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6712245888695593137} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8137459246776515621} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 5.5} + m_SizeDelta: {x: 14.97, y: 37.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &4767970594039775338 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6712245888695593137} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &6936316466172308003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6712245888695593137} + m_CullTransparentMesh: 0 +--- !u!114 &8974435914228705921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6712245888695593137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &6820562647245082904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2606431885992466539} + - component: {fileID: 5016058081671698437} + - component: {fileID: 4119627829735492257} + - component: {fileID: 1728968009245942068} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2606431885992466539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6820562647245082904} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2327268691548940647} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 5.5} + m_SizeDelta: {x: 14.97, y: 37.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &5016058081671698437 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6820562647245082904} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &4119627829735492257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6820562647245082904} + m_CullTransparentMesh: 0 +--- !u!114 &1728968009245942068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6820562647245082904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &6827975069302901155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1133333780268927848} + - component: {fileID: 6397862130251614174} + - component: {fileID: 1710327018534797000} + m_Layer: 5 + m_Name: starPre (19) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1133333780268927848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6827975069302901155} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1} + m_Children: + - {fileID: 1921235167807302561} + m_Father: {fileID: 2320031820122894204} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 69.153496, y: -6.7535} + m_SizeDelta: {x: 32.493, y: 32.493} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6397862130251614174 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6827975069302901155} + m_CullTransparentMesh: 0 +--- !u!114 &1710327018534797000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6827975069302901155} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7129113970089244572 GameObject: m_ObjectHideFlags: 0 @@ -3985,6 +4647,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7262070407360008720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1921235167807302561} + - component: {fileID: 2250874285369845401} + - component: {fileID: 8300603763284033408} + - component: {fileID: 1272119081479104019} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1921235167807302561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262070407360008720} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1133333780268927848} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -11.5} + m_SizeDelta: {x: 14.97, y: 37.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &2250874285369845401 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262070407360008720} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &8300603763284033408 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262070407360008720} + m_CullTransparentMesh: 0 +--- !u!114 &1272119081479104019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262070407360008720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7990096374097274949 GameObject: m_ObjectHideFlags: 0 @@ -4059,6 +4815,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8437516773038393681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3538448680436227613} + - component: {fileID: 8669997763344014173} + - component: {fileID: 6826705516162957443} + - component: {fileID: 3856642705283956229} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3538448680436227613 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8437516773038393681} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8833848101918479878} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -3.47} + m_SizeDelta: {x: 14.97, y: 37.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &8669997763344014173 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8437516773038393681} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &6826705516162957443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8437516773038393681} + m_CullTransparentMesh: 0 +--- !u!114 &3856642705283956229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8437516773038393681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8698872077109538352 GameObject: m_ObjectHideFlags: 0 @@ -4198,6 +5048,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2535060995107670383} m_Modifications: + - target: {fileID: 8625282820443212099, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Name + value: UI_Effect_jinkuang_KaPai + objectReference: {fileID: 0} + - target: {fileID: 8625282820443212099, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_LocalPosition.x @@ -4253,16 +5113,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8625282820443212099, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Name - value: UI_Effect_jinkuang_KaPai - objectReference: {fileID: 0} - - target: {fileID: 8625282820443212099, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &2656711172591673257 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index 5168adaca0..d94cef6969 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -547,6 +547,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &511869547851593204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6186326714576702} + - component: {fileID: 4446719647602724514} + - component: {fileID: 2050567355446114314} + - component: {fileID: 3141285549879338015} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6186326714576702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511869547851593204} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7380528184849112542} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.00002670288, y: 19.2} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &4446719647602724514 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511869547851593204} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &2050567355446114314 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511869547851593204} + m_CullTransparentMesh: 0 +--- !u!114 &3141285549879338015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511869547851593204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &543649049341459627 GameObject: m_ObjectHideFlags: 0 @@ -695,6 +789,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &620590563961699288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5870136067750675163} + - component: {fileID: 1382632329844071106} + - component: {fileID: 3282686349701747879} + - component: {fileID: 2709711909254913892} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5870136067750675163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620590563961699288} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7404045603593764768} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_SizeDelta: {x: -14.76, y: -18.48} + m_Pivot: {x: 0.5, y: 0} +--- !u!95 &1382632329844071106 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620590563961699288} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &3282686349701747879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620590563961699288} + m_CullTransparentMesh: 0 +--- !u!114 &2709711909254913892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620590563961699288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &623923235532163752 GameObject: m_ObjectHideFlags: 0 @@ -7972,6 +8160,82 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &2232382934175097675 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7865542922754469003} + - component: {fileID: 2504112372184753927} + - component: {fileID: 5193286714285430077} + m_Layer: 5 + m_Name: shenhun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7865542922754469003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2232382934175097675} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2170357218623312487} + - {fileID: 1283356402131712891} + - {fileID: 3180701993441633794} + - {fileID: 6329356416232525112} + - {fileID: 7380528184849112542} + - {fileID: 1845128006530525653} + - {fileID: 8076280276223622894} + - {fileID: 7909267848903592036} + m_Father: {fileID: 3721606396940629678} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -72.652, y: 135.7} + m_SizeDelta: {x: 499, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2504112372184753927 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2232382934175097675} + m_CullTransparentMesh: 0 +--- !u!114 &5193286714285430077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2232382934175097675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 15.68 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &2306151611164505418 GameObject: m_ObjectHideFlags: 0 @@ -8117,6 +8381,100 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &2459610402968944381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7220117609996637823} + - component: {fileID: 6062811640494691647} + - component: {fileID: 7462625397419669345} + - component: {fileID: 7932342792871593134} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7220117609996637823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2459610402968944381} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1283356402131712891} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0000076293945, y: 19.2} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &6062811640494691647 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2459610402968944381} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &7462625397419669345 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2459610402968944381} + m_CullTransparentMesh: 0 +--- !u!114 &7932342792871593134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2459610402968944381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2480036439096538003 GameObject: m_ObjectHideFlags: 0 @@ -8622,7 +8980,7 @@ RectTransform: - {fileID: 6701951387245961629} - {fileID: 6804942353938314835} m_Father: {fileID: 3721606396940629678} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8789,6 +9147,51 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2853069031543520155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7404045603593764768} + - component: {fileID: 6924378089272649684} + m_Layer: 5 + m_Name: shenhunPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7404045603593764768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2853069031543520155} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 5870136067750675163} + m_Father: {fileID: 3721606396940629678} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 790.4956, y: -365.1216} + m_SizeDelta: {x: 44.06, y: 77.43} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6924378089272649684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2853069031543520155} + m_CullTransparentMesh: 0 --- !u!1 &2887308213253507610 GameObject: m_ObjectHideFlags: 0 @@ -8945,6 +9348,51 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9B54\u6297\uFF1A" LanguageIndex: 0 +--- !u!1 &2963439919179326189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6329356416232525112} + - component: {fileID: 7308598287584177953} + m_Layer: 5 + m_Name: shenhunPre3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6329356416232525112 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2963439919179326189} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 3179352353803461659} + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7308598287584177953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2963439919179326189} + m_CullTransparentMesh: 0 --- !u!1 &3074937831347884562 GameObject: m_ObjectHideFlags: 0 @@ -9019,6 +9467,145 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3112886630456234083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9090731781994421865} + - component: {fileID: 2643394529277697711} + - component: {fileID: 1620492080116998790} + - component: {fileID: 5876625701258289352} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9090731781994421865 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3112886630456234083} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8076280276223622894} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000034332275, y: 19.2} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &2643394529277697711 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3112886630456234083} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &1620492080116998790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3112886630456234083} + m_CullTransparentMesh: 0 +--- !u!114 &5876625701258289352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3112886630456234083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &3176735535217670954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1283356402131712891} + - component: {fileID: 4144429730720456656} + m_Layer: 5 + m_Name: shenhunPre1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1283356402131712891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3176735535217670954} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 7220117609996637823} + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4144429730720456656 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3176735535217670954} + m_CullTransparentMesh: 0 --- !u!1 &3208424052149884534 GameObject: m_ObjectHideFlags: 0 @@ -10863,6 +11450,51 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4461755839127568994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8076280276223622894} + - component: {fileID: 7888936504104502380} + m_Layer: 5 + m_Name: shenhunPre6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8076280276223622894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4461755839127568994} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 9090731781994421865} + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7888936504104502380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4461755839127568994} + m_CullTransparentMesh: 0 --- !u!1 &4503173981061481418 GameObject: m_ObjectHideFlags: 0 @@ -11712,6 +12344,51 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5106027382188805532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3180701993441633794} + - component: {fileID: 4830524830271220141} + m_Layer: 5 + m_Name: shenhunPre2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3180701993441633794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5106027382188805532} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 3570287312296618681} + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4830524830271220141 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5106027382188805532} + m_CullTransparentMesh: 0 --- !u!1 &5187149294521291017 GameObject: m_ObjectHideFlags: 0 @@ -12162,7 +12839,7 @@ RectTransform: - {fileID: 1765278960298361400} - {fileID: 5194269167604365867} m_Father: {fileID: 3721606396940629678} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12286,6 +12963,51 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 95555 +--- !u!1 &5674750291507712616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1845128006530525653} + - component: {fileID: 3058767237682553964} + m_Layer: 5 + m_Name: shenhunPre5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1845128006530525653 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5674750291507712616} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 2316290894100043431} + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3058767237682553964 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5674750291507712616} + m_CullTransparentMesh: 0 --- !u!1 &5684142345063184018 GameObject: m_ObjectHideFlags: 0 @@ -17766,7 +18488,7 @@ RectTransform: - {fileID: 9177488321271898877} - {fileID: 5841517671855928432} m_Father: {fileID: 3721606396940629678} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -17970,6 +18692,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6530320463162857583} m_CullTransparentMesh: 0 +--- !u!1 &6578171666407097592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7380528184849112542} + - component: {fileID: 4688608861329625077} + m_Layer: 5 + m_Name: shenhunPre4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7380528184849112542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6578171666407097592} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} + m_Children: + - {fileID: 6186326714576702} + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4688608861329625077 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6578171666407097592} + m_CullTransparentMesh: 0 --- !u!1 &6622724125353286540 GameObject: m_ObjectHideFlags: 0 @@ -18223,7 +18990,7 @@ RectTransform: m_Children: - {fileID: 4874310439771447793} m_Father: {fileID: 3721606396940629678} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -19121,6 +19888,194 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7257325349019412213} m_CullTransparentMesh: 0 +--- !u!1 &7343167891512423682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3179352353803461659} + - component: {fileID: 6084094977891495247} + - component: {fileID: 1593411063037206799} + - component: {fileID: 5017157586446746704} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3179352353803461659 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7343167891512423682} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6329356416232525112} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0000076293945, y: 19.2} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &6084094977891495247 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7343167891512423682} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &1593411063037206799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7343167891512423682} + m_CullTransparentMesh: 0 +--- !u!114 &5017157586446746704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7343167891512423682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &7444735705848770160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3570287312296618681} + - component: {fileID: 2064068188611824926} + - component: {fileID: 3932596455457575978} + - component: {fileID: 4668856248714896831} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3570287312296618681 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7444735705848770160} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3180701993441633794} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0000076293945, y: 19.2} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &2064068188611824926 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7444735705848770160} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &3932596455457575978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7444735705848770160} + m_CullTransparentMesh: 0 +--- !u!114 &4668856248714896831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7444735705848770160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7445288465440665979 GameObject: m_ObjectHideFlags: 0 @@ -20489,7 +21444,7 @@ RectTransform: m_Children: - {fileID: 4448274978984460987} m_Father: {fileID: 3721606396940629678} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20914,6 +21869,164 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8560146106842809034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7909267848903592036} + - component: {fileID: 4345334337068021407} + - component: {fileID: 6981410318197966305} + - component: {fileID: 3361806592411621837} + - component: {fileID: 3984213489492909770} + - component: {fileID: 2662890282473641336} + m_Layer: 5 + m_Name: ShenhunBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7909267848903592036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560146106842809034} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 460.89996, y: -28.5} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4345334337068021407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560146106842809034} + m_CullTransparentMesh: 0 +--- !u!114 &6981410318197966305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560146106842809034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9265182fc2643642b4a0cb9f45083d0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3361806592411621837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560146106842809034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6981410318197966305} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &3984213489492909770 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560146106842809034} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2662890282473641336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560146106842809034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8583872197568725010 GameObject: m_ObjectHideFlags: 0 @@ -21231,6 +22344,8 @@ RectTransform: m_Children: - {fileID: 772182037209436319} - {fileID: 4627525642220429389} + - {fileID: 7404045603593764768} + - {fileID: 7865542922754469003} - {fileID: 4628929067735612182} - {fileID: 5115917259150838057} - {fileID: 5548210301968441274} @@ -21572,6 +22687,201 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8953657170714306398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2316290894100043431} + - component: {fileID: 3549864394535687034} + - component: {fileID: 6180304094935914213} + - component: {fileID: 5356206649748097826} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2316290894100043431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8953657170714306398} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1845128006530525653} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000034332275, y: 19.2} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &3549864394535687034 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8953657170714306398} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &6180304094935914213 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8953657170714306398} + m_CullTransparentMesh: 0 +--- !u!114 &5356206649748097826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8953657170714306398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &8970015393984869998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2170357218623312487} + - component: {fileID: 597899323346013861} + - component: {fileID: 2326832853452050466} + - component: {fileID: 1747636738485958289} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2170357218623312487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970015393984869998} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7865542922754469003} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 47.100006, y: -28.5} + m_SizeDelta: {x: 94.3, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &597899323346013861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970015393984869998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &2326832853452050466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970015393984869998} + m_CullTransparentMesh: 0 +--- !u!114 &1747636738485958289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970015393984869998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u795E\u9B42" + LanguageIndex: 0 --- !u!1 &9002346869055633349 GameObject: m_ObjectHideFlags: 0 @@ -21821,7 +23131,7 @@ RectTransform: - {fileID: 7958727975796523612} - {fileID: 3854705220274442484} m_Father: {fileID: 3721606396940629678} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab index 59420c047d..6ce17d428d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab @@ -52,10 +52,10 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: -9 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 6 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -108,7 +108,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -0.0000607245} + m_AnchoredPosition: {x: 0, y: 0.000030114341} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3981280066466389833 @@ -337,7 +337,7 @@ RectTransform: m_Children: - {fileID: 3745660327078023259} - {fileID: 2460528647847384588} - - {fileID: 4864859122014172380} + - {fileID: 8133986337164326410} - {fileID: 855633051782579941} - {fileID: 7083992215520858126} - {fileID: 8544457263562664734} @@ -695,100 +695,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &4177261655291467561 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8229228852124316161} - - component: {fileID: 4458907802769224664} - - component: {fileID: 57776715771972343} - - component: {fileID: 1981108427329497773} - m_Layer: 0 - m_Name: godItem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8229228852124316161 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4177261655291467561} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4864859122014172380} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.000020345, y: 9.76} - m_SizeDelta: {x: 29.24, y: 59.52} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &4458907802769224664 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4177261655291467561} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &57776715771972343 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4177261655291467561} - m_CullTransparentMesh: 0 ---- !u!114 &1981108427329497773 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4177261655291467561} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &4384212767175285194 GameObject: m_ObjectHideFlags: 0 @@ -1024,7 +930,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &5283900474873480367 +--- !u!1 &6002405682149771119 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1032,55 +938,92 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4864859122014172380} - - component: {fileID: 4737436409537813172} - m_Layer: 5 - m_Name: godPre + - component: {fileID: 8731575896283159449} + - component: {fileID: 4506541224064688732} + - component: {fileID: 5036203003476015620} + - component: {fileID: 3714601200071388019} + m_Layer: 0 + m_Name: godItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4864859122014172380 +--- !u!224 &8731575896283159449 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5283900474873480367} + m_GameObject: {fileID: 6002405682149771119} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8229228852124316161} - m_Father: {fileID: 1192127436118750043} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 8133986337164326410} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1437.3, y: -242.2} - m_SizeDelta: {x: 40, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000019073486, y: 9.760002} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4737436409537813172 +--- !u!95 &4506541224064688732 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6002405682149771119} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &5036203003476015620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6002405682149771119} + m_CullTransparentMesh: 0 +--- !u!114 &3714601200071388019 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5283900474873480367} + m_GameObject: {fileID: 6002405682149771119} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 40 - m_PreferredHeight: 40 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6097065128053805043 GameObject: m_ObjectHideFlags: 0 @@ -1356,6 +1299,63 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u9700\u8981\uFF1A" +--- !u!1 &7666310159943617012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8133986337164326410} + - component: {fileID: 1261939006692365050} + m_Layer: 5 + m_Name: godPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8133986337164326410 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7666310159943617012} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8731575896283159449} + m_Father: {fileID: 1192127436118750043} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -7118.8, y: 56.1} + m_SizeDelta: {x: 26.9, y: 67.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1261939006692365050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7666310159943617012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 26.9 + m_PreferredHeight: 67.2 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &7785291308332354919 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 7e937cc97c..0478538ccd 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -59028,7 +59028,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab b/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab index aaf90d0a6a..c2bddeb237 100644 --- a/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab +++ b/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &278048052294698111 +--- !u!1 &19735822544772466 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,92 +8,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5194715697594376535} - - component: {fileID: 559140595063791758} - - component: {fileID: 4246346827292563873} - - component: {fileID: 2404079920792746491} - m_Layer: 0 - m_Name: godItem + - component: {fileID: 3861968913902194252} + - component: {fileID: 5667330594101832077} + m_Layer: 5 + m_Name: starPre (23) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5194715697594376535 +--- !u!224 &3861968913902194252 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278048052294698111} + m_GameObject: {fileID: 19735822544772466} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7793981684746146614} - m_RootOrder: 0 + m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} + m_Children: + - {fileID: 2140679744402653720} + m_Father: {fileID: 1552766642506092791} + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000060989456, y: 0} - m_SizeDelta: {x: 29.24, y: 59.52} - m_Pivot: {x: 0.5, y: 0} ---- !u!95 &559140595063791758 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278048052294698111} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &4246346827292563873 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35.75, y: 89.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5667330594101832077 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278048052294698111} + m_GameObject: {fileID: 19735822544772466} m_CullTransparentMesh: 0 ---- !u!114 &2404079920792746491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278048052294698111} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &363315913945013765 GameObject: m_ObjectHideFlags: 0 @@ -242,7 +193,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &875131960460398882 +--- !u!1 &973075496464267330 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -250,42 +201,87 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4191954925069212221} - - component: {fileID: 8866906132079810087} + - component: {fileID: 632629919765873551} + - component: {fileID: 7787049964320271559} m_Layer: 5 - m_Name: starPre (19) + m_Name: starPre (22) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4191954925069212221 +--- !u!224 &632629919765873551 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 875131960460398882} + m_GameObject: {fileID: 973075496464267330} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} m_Children: - - {fileID: 3678637889087168226} + - {fileID: 963550387596219264} m_Father: {fileID: 1552766642506092791} - m_RootOrder: 18 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 45, y: 78} + m_SizeDelta: {x: 35.75, y: 89.42} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8866906132079810087 +--- !u!222 &7787049964320271559 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 875131960460398882} + m_GameObject: {fileID: 973075496464267330} + m_CullTransparentMesh: 0 +--- !u!1 &1143122050410495277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 41955810522415507} + - component: {fileID: 4085841906346281726} + m_Layer: 5 + m_Name: starPre (20) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &41955810522415507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143122050410495277} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} + m_Children: + - {fileID: 2509571850110148563} + m_Father: {fileID: 1552766642506092791} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35.75, y: 89.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4085841906346281726 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143122050410495277} m_CullTransparentMesh: 0 --- !u!1 &1626374441078482171 GameObject: @@ -705,11 +701,11 @@ RectTransform: - {fileID: 1527732943800344204} - {fileID: 4921417269786883892} - {fileID: 1397539620555614202} - - {fileID: 4191954925069212221} - - {fileID: 9201332041741167554} - - {fileID: 7416148664016159031} - - {fileID: 7793981684746146614} - - {fileID: 7837452548704389808} + - {fileID: 3460032746863086171} + - {fileID: 41955810522415507} + - {fileID: 67836317274450090} + - {fileID: 632629919765873551} + - {fileID: 3861968913902194252} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -738,7 +734,7 @@ MonoBehaviour: m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!1 &1627294551272884993 @@ -1594,7 +1590,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 45, y: 78} + m_SizeDelta: {x: 35.75, y: 89.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8619974066176684919 CanvasRenderer: @@ -1678,96 +1674,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3436152023862128437 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9201332041741167554} - - component: {fileID: 1318391489919002728} - m_Layer: 5 - m_Name: starPre (20) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9201332041741167554 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3436152023862128437} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} - m_Children: - - {fileID: 553063187477524269} - m_Father: {fileID: 1552766642506092791} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 45, y: 78} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1318391489919002728 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3436152023862128437} - m_CullTransparentMesh: 0 ---- !u!1 &4016155825823518163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7837452548704389808} - - component: {fileID: 5830804416163909474} - m_Layer: 5 - m_Name: starPre (23) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7837452548704389808 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4016155825823518163} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} - m_Children: - - {fileID: 4573221846624602990} - m_Father: {fileID: 1552766642506092791} - m_RootOrder: 22 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 45, y: 78} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5830804416163909474 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4016155825823518163} - m_CullTransparentMesh: 0 --- !u!1 &4019731748636677328 GameObject: m_ObjectHideFlags: 0 @@ -2067,6 +1973,194 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4575033509618147585 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5952591708762101349} + - component: {fileID: 2655531992509407668} + - component: {fileID: 285422115754699651} + - component: {fileID: 1943037394666906652} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5952591708762101349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4575033509618147585} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 67836317274450090} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.125, y: 1.67} + m_SizeDelta: {x: -14.629999, y: -37.219982} + m_Pivot: {x: 0.5, y: 0} +--- !u!95 &2655531992509407668 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4575033509618147585} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &285422115754699651 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4575033509618147585} + m_CullTransparentMesh: 0 +--- !u!114 &1943037394666906652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4575033509618147585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &4964524054382556677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2509571850110148563} + - component: {fileID: 4642416904858124546} + - component: {fileID: 3308844759334502062} + - component: {fileID: 4081159108590184657} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2509571850110148563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4964524054382556677} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 41955810522415507} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.125, y: 1.67} + m_SizeDelta: {x: -14.629999, y: -37.219982} + m_Pivot: {x: 0.5, y: 0} +--- !u!95 &4642416904858124546 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4964524054382556677} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &3308844759334502062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4964524054382556677} + m_CullTransparentMesh: 0 +--- !u!114 &4081159108590184657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4964524054382556677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5054203983919794081 GameObject: m_ObjectHideFlags: 0 @@ -2174,10 +2268,10 @@ RectTransform: m_Father: {fileID: 1397539620555614202} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000060989456, y: 0} - m_SizeDelta: {x: 29.24, y: 59.52} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.125, y: 1.67} + m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4787264721783863393 Animator: @@ -2460,100 +2554,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5503510157846415877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553063187477524269} - - component: {fileID: 5222417475365531380} - - component: {fileID: 8454870164520966107} - - component: {fileID: 7991276477128865665} - m_Layer: 0 - m_Name: godItem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &553063187477524269 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5503510157846415877} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 9201332041741167554} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000060989456, y: 0} - m_SizeDelta: {x: 29.24, y: 59.52} - m_Pivot: {x: 0.5, y: 0} ---- !u!95 &5222417475365531380 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5503510157846415877} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &8454870164520966107 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5503510157846415877} - m_CullTransparentMesh: 0 ---- !u!114 &7991276477128865665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5503510157846415877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &5589626010518342017 GameObject: m_ObjectHideFlags: 0 @@ -2629,145 +2629,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6116126309958326699 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7793981684746146614} - - component: {fileID: 1999854940821883499} - m_Layer: 5 - m_Name: starPre (22) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7793981684746146614 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6116126309958326699} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} - m_Children: - - {fileID: 5194715697594376535} - m_Father: {fileID: 1552766642506092791} - m_RootOrder: 21 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 45, y: 78} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1999854940821883499 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6116126309958326699} - m_CullTransparentMesh: 0 ---- !u!1 &6289653273819467705 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2055280843150076561} - - component: {fileID: 6003564412037049160} - - component: {fileID: 7961388453873275495} - - component: {fileID: 8489149635605180989} - m_Layer: 0 - m_Name: godItem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2055280843150076561 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6289653273819467705} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7416148664016159031} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000060989456, y: 0} - m_SizeDelta: {x: 29.24, y: 59.52} - m_Pivot: {x: 0.5, y: 0} ---- !u!95 &6003564412037049160 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6289653273819467705} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &7961388453873275495 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6289653273819467705} - m_CullTransparentMesh: 0 ---- !u!114 &8489149635605180989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6289653273819467705} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &6645247576316167878 GameObject: m_ObjectHideFlags: 0 @@ -2916,51 +2777,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6760839273393200124 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7416148664016159031} - - component: {fileID: 2856477222987465365} - m_Layer: 5 - m_Name: starPre (21) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7416148664016159031 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6760839273393200124} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} - m_Children: - - {fileID: 2055280843150076561} - m_Father: {fileID: 1552766642506092791} - m_RootOrder: 20 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 45, y: 78} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2856477222987465365 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6760839273393200124} - m_CullTransparentMesh: 0 --- !u!1 &6835858106842165169 GameObject: m_ObjectHideFlags: 0 @@ -3111,7 +2927,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8411558997896490566 +--- !u!1 &7730842640928431030 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3119,10 +2935,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4573221846624602990} - - component: {fileID: 8116181444618390199} - - component: {fileID: 5588407063609799576} - - component: {fileID: 6214139133646836674} + - component: {fileID: 3460032746863086171} + - component: {fileID: 2581908736259522935} + m_Layer: 5 + m_Name: starPre (19) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3460032746863086171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7730842640928431030} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} + m_Children: + - {fileID: 824128566917954867} + m_Father: {fileID: 1552766642506092791} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35.75, y: 89.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2581908736259522935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7730842640928431030} + m_CullTransparentMesh: 0 +--- !u!1 &7909902202858611709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 67836317274450090} + - component: {fileID: 3131733994606035361} + m_Layer: 5 + m_Name: starPre (21) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &67836317274450090 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7909902202858611709} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0007493, y: 1.0007493, z: 1} + m_Children: + - {fileID: 5952591708762101349} + m_Father: {fileID: 1552766642506092791} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35.75, y: 89.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3131733994606035361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7909902202858611709} + m_CullTransparentMesh: 0 +--- !u!1 &8005282260786757146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963550387596219264} + - component: {fileID: 4874594261059891495} + - component: {fileID: 3329828617004547049} + - component: {fileID: 6117196231796674274} m_Layer: 0 m_Name: godItem m_TagString: Untagged @@ -3130,33 +3036,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4573221846624602990 +--- !u!224 &963550387596219264 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8411558997896490566} + m_GameObject: {fileID: 8005282260786757146} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7837452548704389808} + m_Father: {fileID: 632629919765873551} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000060989456, y: 0} - m_SizeDelta: {x: 29.24, y: 59.52} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.125, y: 1.67} + m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} ---- !u!95 &8116181444618390199 +--- !u!95 &4874594261059891495 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8411558997896490566} + m_GameObject: {fileID: 8005282260786757146} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} @@ -3168,21 +3074,21 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &5588407063609799576 +--- !u!222 &3329828617004547049 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8411558997896490566} + m_GameObject: {fileID: 8005282260786757146} m_CullTransparentMesh: 0 ---- !u!114 &6214139133646836674 +--- !u!114 &6117196231796674274 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8411558997896490566} + m_GameObject: {fileID: 8005282260786757146} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -3205,7 +3111,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8701412937766845386 +--- !u!1 &8108893216320253081 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3213,10 +3119,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3678637889087168226} - - component: {fileID: 8995945360783335227} - - component: {fileID: 4752562307206620692} - - component: {fileID: 6505293803255449166} + - component: {fileID: 2140679744402653720} + - component: {fileID: 745703553484805016} + - component: {fileID: 7021960591243191168} + - component: {fileID: 7738839616650987206} m_Layer: 0 m_Name: godItem m_TagString: Untagged @@ -3224,33 +3130,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3678637889087168226 +--- !u!224 &2140679744402653720 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8701412937766845386} + m_GameObject: {fileID: 8108893216320253081} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4191954925069212221} + m_Father: {fileID: 3861968913902194252} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000060989456, y: 0} - m_SizeDelta: {x: 29.24, y: 59.52} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.125, y: 1.67} + m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} ---- !u!95 &8995945360783335227 +--- !u!95 &745703553484805016 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8701412937766845386} + m_GameObject: {fileID: 8108893216320253081} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} @@ -3262,21 +3168,21 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &4752562307206620692 +--- !u!222 &7021960591243191168 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8701412937766845386} + m_GameObject: {fileID: 8108893216320253081} m_CullTransparentMesh: 0 ---- !u!114 &6505293803255449166 +--- !u!114 &7738839616650987206 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8701412937766845386} + m_GameObject: {fileID: 8108893216320253081} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -3374,3 +3280,97 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9196643433412574023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 824128566917954867} + - component: {fileID: 5179213922337160743} + - component: {fileID: 6635725049036908178} + - component: {fileID: 160134346190579696} + m_Layer: 0 + m_Name: godItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &824128566917954867 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9196643433412574023} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3460032746863086171} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.125, y: 1.67} + m_SizeDelta: {x: -14.629999, y: -37.219982} + m_Pivot: {x: 0.5, y: 0} +--- !u!95 &5179213922337160743 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9196643433412574023} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!222 &6635725049036908178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9196643433412574023} + m_CullTransparentMesh: 0 +--- !u!114 &160134346190579696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9196643433412574023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 95ef5e176c..62077840dc 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -409,11 +409,19 @@ end --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation) - local starSize = Vector2(35,35) + local starSize + if type == 3 then + starSize = Vector2.New(35.75,89.42) + else + starSize = Vector2(35,35) + end if _starSize then starSize = _starSize end local scale = -17.78 + if type == 3 then + scale = -13.2 + end if _scale then scale = _scale end @@ -436,30 +444,28 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot starPre.transform:SetAsFirstSibling() starPre:GetComponent("LayoutGroup").spacing = scale starPre:GetComponent("RectTransform").pivot = pivot - if star < 6 then - if type and type == 3 then - for i = 1, 23 do - if i > 17 and i == star + 17 then - starPre.transform:GetChild(i - 1).gameObject:SetActive(true) - else - starPre.transform:GetChild(i - 1).gameObject:SetActive(false) - end - end - else - for i = 1, 23 do - if i <= star then - starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[1]) - starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize - if rotation then - starPre.transform:GetChild(i - 1):GetComponent("RectTransform").rotation = Quaternion.Euler(rotation) - end - starPre.transform:GetChild(i - 1).gameObject:SetActive(true) - else - starPre.transform:GetChild(i - 1).gameObject:SetActive(false) + if star < 7 and type and type == 3 then + for i = 1, 23 do + if i > 17 and i <= star + 17 then + starPre.transform:GetChild(i - 1).gameObject:SetActive(true) + starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize + else + starPre.transform:GetChild(i - 1).gameObject:SetActive(false) + end + end + elseif star < 6 then + for i = 1, 23 do + if i <= star then + starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[1]) + starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize + if rotation then + starPre.transform:GetChild(i - 1):GetComponent("RectTransform").rotation = Quaternion.Euler(rotation) end + starPre.transform:GetChild(i - 1).gameObject:SetActive(true) + else + starPre.transform:GetChild(i - 1).gameObject:SetActive(false) end end - elseif star > 5 and star < 10 then for i = 1, 23 do if i <= star - 5 then @@ -543,13 +549,19 @@ local star2index = { [4] = {1, 2, 4, 5}, [5] = {1, 2, 3, 4, 5} } -function SetCardStars(starGrid, star) - for i = 1, 15 do +function SetCardStars(starGrid, star,starType) + for i = 1, 21 do starGrid.transform:GetChild(i - 1).gameObject:SetActive(false) end if star < 6 then - for _, i in ipairs(star2index[star]) do - starGrid.transform:GetChild(i - 1).gameObject:SetActive(true) + if starType == 3 then + for _, i in ipairs(star2index[star]) do + starGrid.transform:GetChild(16 + i - 1).gameObject:SetActive(true) + end + else + for _, i in ipairs(star2index[star]) do + starGrid.transform:GetChild(i - 1).gameObject:SetActive(true) + end end elseif star > 5 and star < 10 then for _, i in ipairs(star2index[star-5]) do diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 8b1006478c..b18182df35 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -470,6 +470,7 @@ TEAMSIMPLEINFO_STAR_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO_POSITION_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO_SKINID_FIELD = protobuf.FieldDescriptor(); +TEAMSIMPLEINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO = protobuf.Descriptor(); TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor(); @@ -5266,11 +5267,21 @@ TEAMSIMPLEINFO_SKINID_FIELD.default_value = 0 TEAMSIMPLEINFO_SKINID_FIELD.type = 5 TEAMSIMPLEINFO_SKINID_FIELD.cpp_type = 1 +TEAMSIMPLEINFO_GODSOULLV_FIELD.name = "godSoulLv" +TEAMSIMPLEINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.godSoulLv" +TEAMSIMPLEINFO_GODSOULLV_FIELD.number = 7 +TEAMSIMPLEINFO_GODSOULLV_FIELD.index = 6 +TEAMSIMPLEINFO_GODSOULLV_FIELD.label = 1 +TEAMSIMPLEINFO_GODSOULLV_FIELD.has_default_value = false +TEAMSIMPLEINFO_GODSOULLV_FIELD.default_value = 0 +TEAMSIMPLEINFO_GODSOULLV_FIELD.type = 5 +TEAMSIMPLEINFO_GODSOULLV_FIELD.cpp_type = 1 + TEAMSIMPLEINFO.name = "TeamSimpleInfo" TEAMSIMPLEINFO.full_name = ".rpc.protocols.TeamSimpleInfo" TEAMSIMPLEINFO.nested_types = {} TEAMSIMPLEINFO.enum_types = {} -TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD} +TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD, TEAMSIMPLEINFO_GODSOULLV_FIELD} TEAMSIMPLEINFO.is_extendable = false TEAMSIMPLEINFO.extensions = {} TEAMONETEAMINFO_TEAM_FIELD.name = "team" diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 867104f326..de9c72ed67 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -525,7 +525,8 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroData.star]) pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) - SetCardStars(starGrid,heroData.star) + local star,starType = heroData.GetStar() + SetCardStars(starGrid,star,starType) if heroData.star > 9 then Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true) else @@ -759,7 +760,14 @@ function this.SingleHeroDataShow(_go, _heroData) pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) pos.sprite = this.spLoader:LoadSprite(heroData.professionIcon) local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, starGrid, star,starType,Vector2.New(30,30),-8) + local starSize = Vector2.New(30,30) + local starScale = -8 + if starType == 3 then + starSize = Vector2.New(33.43,83.61) + starScale = -16.86 + end + SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) + --血量显示 local curHeroHpVal = FormationManager.GetFormationHeroHp(this.curFormationIndex,_heroData.dynamicId) yuanImage:SetActive(heroData.createtype == 1) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua index 03cb5b60bd..0ec640ddff 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua @@ -32,20 +32,37 @@ end --绑定事件(用于子类重写) function GeneralBigPopup_RoleGodSoulUp:BindEvent() Util.AddClick(self.oneKeyBtn,function () - local isenuough,enoughNums = GodSoulManager.CheckCanUpGodSoul(self.curHeroData,self.lv,self.allDatas) + local isenuough,enoughNums,enoughDatas,oldEnoughDatas = false,nil,nil,nil + self.choosedIdList = {} + for i = 1,#self.allDatas do + table.insert(self.choosedIdList,self.allDatas[i].herodata.dynamicId) + isenuough,enoughNums,enoughDatas = GodSoulManager.CheckCanUpGodSoul(self.curHeroData,self.lv,self.choosedIdList) + if isenuough then + self:RefreshCostItemNums() + self:RefreshItemDatas() + break + else + if not oldEnoughDatas then + oldEnoughDatas = enoughDatas + else + local ismove = true + for k,v in pairs(oldEnoughDatas) do + if v ~= enoughDatas[k] then + ismove = false + break + end + end + if ismove then + table.remove(self.choosedIdList,#self.choosedIdList) + end + oldEnoughDatas = enoughDatas + end + end + end if not isenuough then PopupTipPanel.ShowTip("无法满足激活条件!") return end - for i = 1,#self.allDatas do - self.choosedIdList = {} - table.insert(self.choosedIdList,self.allDatas[i].herodata.dynamicId) - isenuough,enoughNums = GodSoulManager.CheckCanUpGodSoul(self.curHeroData,self.lv,self.choosedIdList) - if isenuough then - self:RefreshCostItemNums() - break - end - end end) Util.AddClick(self.sureBtn,function() local isSave = false @@ -154,7 +171,13 @@ function GeneralBigPopup_RoleGodSoulUp:SetSingleData(index,go,heroData) self.itemlist[index].pos.sprite = self.spLoader:LoadSprite(self.itemlist[index].data.professionIcon) local star,starType = self.itemlist[index].data.GetStar(1) - SetHeroStars(self.spLoader, self.itemlist[index].starGrid, star,starType,Vector2.New(30,30),-8) + local starSize = Vector2.New(30,30) + local starScale = -8 + if starType == 3 then + starSize = Vector2.New(33.43,83.61) + starScale = -16.86 + end + SetHeroStars(self.spLoader, self.itemlist[index].starGrid, star,starType,starSize,starScale) self.itemlist[index].select.gameObject:SetActive(false) self.itemlist[index].mask.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua index e239ff1d91..3ca2588cf1 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua @@ -33,12 +33,12 @@ function this.InitializeTableData() local config = heroRankupGroup[v.Soul[i][3]] if config.Issame == 1 then data.id = v.Id - data.property = v.PropertyName - data.profession = v.Profession + data.property = 0 + data.profession = 0 elseif config.IsId > 0 then data.id = config.IsId - data.property = heroConfig[config.IsId].PropertyName - data.profession = heroConfig[config.IsId].Profession + data.property = 0 + data.profession = 0 else data.id = 0 if config.IsSameClan == 1 then @@ -304,43 +304,58 @@ function this.CheckCanUpGodSoul(curHeroData,lv,datas) end end local godData = this.GetGodSoulDataByLv(curHeroData.heroConfig.Id,lv) - local enoughData = {} + local enoughData = {} --每个条件满足的数量 + local enoughDatas = {} --每个条件是否满足 for j = 1,#godData do if not enoughData[j] then enoughData[j] = 0 end end + for j = 1,#godData do + if not enoughDatas[j] then + enoughDatas[j] = false + end + end local s = function() local isAll = true + enoughDatas = {} for i = 1,#enoughData do if enoughData[i] < godData[i].num then isAll = false - return isAll,enoughData + enoughDatas[i] = false + else + enoughDatas[i] = true end end - return isAll,enoughData + return isAll,enoughData,enoughDatas end if godData then - for k,v in pairs(godDatas) do - if this.CheckExistBindHeroDataByDid(curHeroData.dynamicId,v.dynamicId) > 0 then + for k,v in pairs(godDatas) do + local isChoosed = this.CheckExistBindHeroDataByDid(curHeroData.dynamicId,v.dynamicId) + if isChoosed and isChoosed ~= lv then else for j = 1,#godData do - if (godData[j].id == 0 or v.id == godData[j].id) - and (v.star >= godData[j].star) - and (godData[j].property == 0 or v.property == godData[j].property) - and (godData[j].profession == 0 or v.profession == godData[j].profession) - and v.dynamicId ~= curHeroData.dynamicId then - enoughData[j] = enoughData[j] + 1 + if v.star >= godData[j].star then + if godData[j].id > 0 and v.heroConfig.Id == godData[j].id then + enoughData[j] = enoughData[j] + 1 + elseif godData[j].property > 0 and v.property == godData[j].property then + enoughData[j] = enoughData[j] + 1 + elseif godData[j].profession > 0 and v.profession == godData[j].profession then + enoughData[j] = enoughData[j] + 1 + elseif godData[j].property == 0 and godData[j].profession == 0 and godData[j].id == 0 then + enoughData[j] = enoughData[j] + 1 + end + local isAll,enoughData,enoughDatas = s() + if isAll then + return isAll,enoughData,enoughDatas + end end - end - if s() then - break - end - end + end + end end return s() end - return false,enoughData + return false,enoughData,enoughDatas end function this.GetHeroGodSoulDatas(dynamicId,id,_lv) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 66ad2a1fe2..2f040b0294 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -3,11 +3,13 @@ HandBookHeroInfoPanel = Inherit(BasePanel) local this = HandBookHeroInfoPanel local tabs = { - [1] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11093], sub = SubUIConfig.HandBookRoleInfoLayout + [RoleInfoPanelIndex.qingbao] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11093], sub = SubUIConfig.HandBookRoleInfoLayout }, - [2] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11095], sub = SubUIConfig.RoleStoryLayout + [RoleInfoPanelIndex.shenhun] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = "神魂",sub = SubUIConfig.RoleGodSoulLayout }, - [3] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11816], sub = SubUIConfig.HandBookRoleSkinPanel + [RoleInfoPanelIndex.chuanshuo] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11095], sub = SubUIConfig.RoleStoryLayout + }, + [RoleInfoPanelIndex.pifu] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11816], sub = SubUIConfig.HandBookRoleSkinPanel }, } @@ -112,7 +114,7 @@ function HandBookHeroInfoPanel:OnOpen(...) if(temp[3]) then _curStar=temp[3] end - _CurPageIndex = 1 + _CurPageIndex = RoleInfoPanelIndex.qingbao heroDatas = PlayerManager.heroHandBookListData[_curStar] for i = 1, #heroDatas do if heroConFigData.Id == heroDatas[i].Id then @@ -229,7 +231,7 @@ function this:UpdateHeroInfoData() this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession)) this.posText.text=GetLanguageStrById(heroConFigData.HeroLocation) SetTextVerTial(self.posText,Vector3.New(72,0,0)) - if _CurPageIndex == 3 then + if _CurPageIndex == RoleInfoPanelIndex.pifu then local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id) local HeoSkin = {} for i = 1 ,#configs do @@ -238,7 +240,11 @@ function this:UpdateHeroInfoData() end end if LengthOfTable(HeoSkin) < 2 then - _CurPageIndex = 1 + _CurPageIndex = RoleInfoPanelIndex.qingbao + end + elseif _CurPageIndex == RoleInfoPanelIndex.shenhun then + if heroConFigData.IsSoulOpen == 0 then + _CurPageIndex = RoleInfoPanelIndex.qingbao end end self:SetPanelBg(heroConFigData) @@ -259,35 +265,43 @@ function HandBookHeroInfoPanel:UpdateBtnList() for k,v in pairs(tabsList) do tabsList[k].gameObject:SetActive(false) end - for k,v in ipairs(tabs) do - if not tabsList[k] then - tabsList[k] = newObjToParent(this.btnPre,this.btnList) - end - if k == 3 then - local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id) - local HeoSkin = {} - for i = 1 ,#configs do - if not HeoSkin[configs[i].Type] and configs[i].Show == 1 then - HeoSkin[configs[i].Type] = configs[i] + for k = 1,10 do + if tabs[k] then + if not tabsList[k] then + tabsList[k] = newObjToParent(this.btnPre,this.btnList) + end + if k == RoleInfoPanelIndex.pifu then + local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id) + local HeoSkin = {} + for i = 1 ,#configs do + if not HeoSkin[configs[i].Type] and configs[i].Show == 1 then + HeoSkin[configs[i].Type] = configs[i] + end end - end - if LengthOfTable(HeoSkin) > 1 then + if LengthOfTable(HeoSkin) > 1 then + tabsList[k].gameObject:SetActive(true) + else + tabsList[k].gameObject:SetActive(false) + end + elseif k == RoleInfoPanelIndex.shenhun then + if heroConFigData.IsSoulOpen == 0 then + tabsList[k].gameObject:SetActive(false) + else + tabsList[k].gameObject:SetActive(true) + end + else tabsList[k].gameObject:SetActive(true) - else - tabsList[k].gameObject:SetActive(false) end - else - tabsList[k].gameObject:SetActive(true) + local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text") + title.text = GetCurLanguage() == 0 and tabs[k].title or ""..tabs[k].title.."" + Util.AddOnceClick(tabsList[k],function() + if k == _CurPageIndex then + else + self:SetSelectBtn(k) + self:OnPageTabChange(k) + end + end) end - local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text") - title.text = GetCurLanguage() == 0 and v.title or ""..v.title.."" - Util.AddOnceClick(tabsList[k],function() - if k == _CurPageIndex then - else - self:SetSelectBtn(k) - self:OnPageTabChange(k) - end - end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index a42f7c6216..8166133ac2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6036,7 +6036,7 @@ function NetManager.HeroGodSoulBindRequest(heroId,lv,bindheros,func) table.insert(returnData.godSoulList,singledata) GodSoulManager.UnBindHeroDatas(heroId,lv,true) GodSoulManager.BindHeroDatas(returnData) - Game.GlobalEvent.DispatchEvent(GameEvent.Role.UpdateSodSoulLayout) + Game.GlobalEvent:DispatchEvent(GameEvent.Role.UpdateSodSoulLayout) if func then func() end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 2ca8dd65e5..cb41b16f61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -334,8 +334,13 @@ function this.FormationAdapter(teamInfo) if demonId then local heroGo = Util.GetGameObject(this.Demons[hero.position], "hero") heroGo:SetActive(true) + LogGreen("hero.Star:"..hero.star.." hero.godsoul:"..hero.godSoulLv) local star,starType = GetStarOrGodSoulLv(1,hero) - SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType) + local starSize = Vector2.New(35,35) + if starType == 3 then + starSize = Vector2.New(35.75,89.42) + end + SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,starSize) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index b854df4871..ec51678b54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -74,10 +74,43 @@ function RoleInfoPopup:InitComponent() this.soulPrintInfo = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/SoulPrintInfo") this.soulPrintGrid = Util.GetGameObject(this.soulPrintInfo, "Grid") this.soulPrintPre=Util.GetGameObject(this.soulPrintGrid,"SoulPrintPre") + + this.shenhunList = {} + this.shenhunRoot = Util.GetGameObject(this.roleInfo1,"shenhun") + for i = 1,6 do + if not this.shenhunList[i] then + this.shenhunList[i] = {} + end + this.shenhunList[i].go = Util.GetGameObject(this.shenhunRoot, "shenhunPre"..i) + LogGreen("this.shenhunList[i].go:"..tostring(this.shenhunList[i].go.name)) + this.shenhunList[i].goItem = Util.GetGameObject(this.shenhunList[i].go, "godItem"):GetComponent("Animator") + end + this.ShenhunBtn = Util.GetGameObject(this.shenhunRoot,"ShenhunBtn") end --绑定事件(用于子类重写) function RoleInfoPopup:BindEvent() + Util.AddClick(this.ShenhunBtn,function() + local s = function() + local pro = {} + local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId) + local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0) + local color = "000000" + for i = 1,6 do + if lv >= i then + color = "FF0000" + end + table.insert(pro,string.format("%s",color,skillList[i].skill)) + end + return pro + end + local data = {} + local singData = {} + singData.title = "神魂效果" + singData.pro = s() + table.insert(data,singData) + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.WuJinShuXing,data) + end) Util.AddClick(this.talentBtn,function() UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) end) @@ -242,23 +275,41 @@ function this.RoleInfo1() this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation) SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft") - --品阶 - local pId=0 - if curHeroData.breakId~=0 then - pId= heroRankupConfig[curHeroData.breakId].Phase[2] - end - local hruConfig= ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.HeroRankupConfig,"Star",curHeroData.heroConfig.Star,"Show",1) --动态获取不同英雄最大突破等阶 - for i = 1, #hruConfig do --动态生成 - local item=this.pinjieList[i] - if not item then - item= newObjToParent(this.pinjiePre,this.pinjieRoot) - item.name="Pre"..i - this.pinjieList[i]=item + + local star,starType = curHeroData.GetStar(1) + if starType == 3 then + this.pinjieRoot.gameObject:SetActive(false) + this.shenhunRoot.gameObject:SetActive(true) + for i = 1,#this.shenhunList do + if i > star then + Util.SetGray(this.shenhunList[i].go,true) + this.shenhunList[i].godItem.enabled = false + else + Util.SetGray(this.shenhunList[i].go,false) + this.shenhunList[i].godItem.enabled = true + end + end + else + this.shenhunRoot.gameObject:SetActive(false) + this.pinjieRoot.gameObject:SetActive(true) + --品阶 + local pId=0 + if curHeroData.breakId~=0 then + pId= heroRankupConfig[curHeroData.breakId].Phase[2] + end + local hruConfig= ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.HeroRankupConfig,"Star",curHeroData.heroConfig.Star,"Show",1) --动态获取不同英雄最大突破等阶 + for i = 1, #hruConfig do --动态生成 + local item=this.pinjieList[i] + if not item then + item= newObjToParent(this.pinjiePre,this.pinjieRoot) + item.name="Pre"..i + this.pinjieList[i]=item + end + this.pinjieList[i]:GetComponent("Image").sprite=this.spLoader:LoadSprite(i<=pId and pinjieImage[2] or pinjieImage[1]) + end + for n = 1, this.pinjieRoot.transform.childCount - 1 do --超过品阶关闭显示 + this.pinjieRoot.transform:GetChild(n).gameObject:SetActive(n<=#hruConfig) end - this.pinjieList[i]:GetComponent("Image").sprite=this.spLoader:LoadSprite(i<=pId and pinjieImage[2] or pinjieImage[1]) - end - for n = 1, this.pinjieRoot.transform.childCount - 1 do --超过品阶关闭显示 - this.pinjieRoot.transform:GetChild(n).gameObject:SetActive(n<=#hruConfig) end --基础属性 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua index a93083bbdf..bb36a91036 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua @@ -148,7 +148,13 @@ function this.RefreshPanel() pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName)) lv.text=v.level local star,starType = GetStarOrGodSoulLv(1,v) - SetHeroStars(this.spLoader, star, star,starType,Vector2.New(30,30),-8.21) + local starSize = Vector2.New(30,30) + local starScale = -8.21 + if starType == 3 then + starSize = Vector2.New(35.75,89.42) + starScale = -10 + end + SetHeroStars(this.spLoader, star, star,starType,starSize,starScale) --血量相关 hpExp.value=v.heroHp/10000 Util.SetGray(o,v.heroHp<=0) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index b9dfb57bcb..57c0c6669b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -110,7 +110,13 @@ function this.SingleHeroDataShow(go,_heroData) --Util.GetGameObject(_go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) local starGrid = Util.GetGameObject(_go.transform, "star") local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, starGrid, star,starType,Vector2.New(32.5,32.5),-15) + local starSize = Vector2.New(32.5,32.5) + local starScale = -15 + if starType == 3 then + starSize = Vector2.New(35.75,89.42) + starScale = -16.86 + end + SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) local choosed =Util.GetGameObject(_go.transform, "choosed") local formationMask =Util.GetGameObject(_go.transform, "formationMask") Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh") diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index ff144d10c8..94ca4d38f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -144,7 +144,11 @@ function this.SingleHeroDataShow(go,_heroData) --Util.GetGameObject(_go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) local starGrid = Util.GetGameObject(_go.transform, "star") local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, starGrid, star,starType,nil,-15) + local starScale = -15 + if starType == 3 then + starScale = -16.86 + end + SetHeroStars(this.spLoader, starGrid, star,starType,nil,starScale) local choosed =Util.GetGameObject(_go.transform, "choosed") local formationMask =Util.GetGameObject(_go.transform, "formationMask") Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua index 866ec82d95..720746c73b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua @@ -71,8 +71,14 @@ function RoleAwakeSuccessPanel:OnOpen(_curHeroData,_nextHeroUpStarId,_curHeroRan this.LiveName = GetResourcePath(curHeroData.heroConfig.Live) this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform, Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0)) - local star,starType = curHeroData.GetStar(1) - SetHeroStars(this.spLoader, this.starGrid, star,starType,Vector2.New(60,60),-11,Vector2.New(0.5,0.5)) + local star,starType = curHeroData.GetStar(1) + local starSize = Vector2.New(60,60) + local starScale = -11 + if starType == 3 then + starSize = Vector2.New(55.3,138.2) + starScale = -13 + end + SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale,Vector2.New(0.5,0.5)) this.profession.sprite = this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) this.heroName.text =GetLanguageStrById(curHeroData.heroConfig.ReadingName) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 470aafbe19..42d9fbb688 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -573,7 +573,11 @@ function this.ShowHeroEquip() this.heroIcon.sprite = this.spLoader:LoadSprite(curHeroData.painting) this.heroProIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) local star,starType = curHeroData.GetStar(1) - SetHeroStars(this.spLoader, this.heroStarGrid, star,starType,nil,-10) + local starScale = -10 + if starType == 3 then + starScale = -13.2 + end + SetHeroStars(this.spLoader, this.heroStarGrid, star,starType,nil,starScale) --装备的数据 curHeroEquipDatas = {} for i = 1, #curHeroData.equipIdList do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua index ad8a3308c8..e8608c0e2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua @@ -53,8 +53,18 @@ function RoleGodSoulLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen, end function RoleGodSoulLayout:UpdateGodList() - self.lv = GodSoulManager.GetGodSoulLv(self.curHeroData.dynamicId) - self.godDatas = GodSoulManager.GetGodSoulDataByLv(self.curHeroData.heroConfig.Id,0) + if self.curHeroData.dynamicId then + self.lv = GodSoulManager.GetGodSoulLv(self.curHeroData.dynamicId) + self.addShow = true + self.heroConfig = self.curHeroData.heroConfig + else + self.lv = 0 + self.addShow = false + self.heroConfig = self.curHeroData + end + + self.godDatas = GodSoulManager.GetGodSoulDataByLv(self.heroConfig.Id,0) + if not self.gridList then self.gridList = {} end @@ -91,61 +101,67 @@ function RoleGodSoulLayout:UpdataSingleGod(index) end end --绿色 - self.gridList[index].des.text = self.godDatas[index].skill --神魂效果 绿色 未激活时置灰 + + for i = 1,math.max(#self.gridList[index].costList,#self.godDatas[index]) do + if not self.godDatas[index][i] then + self.gridList[index].costList[i].go.gameObject:SetActive(false) + else + if not self.gridList[index].costList[i] then + self.gridList[index].costList[i] = {} + self.gridList[index].costList[i].go = newObjToParent(self.costPre,self.gridList[index].costGrid) + self.gridList[index].costList[i].frame = Util.GetGameObject(self.gridList[index].costList[i].go,"frame"):GetComponent("Image") + self.gridList[index].costList[i].icon = Util.GetGameObject(self.gridList[index].costList[i].frame.transform,"icon"):GetComponent("Image") + self.gridList[index].costList[i].num = Util.GetGameObject(self.gridList[index].costList[i].go,"num"):GetComponent("Text") + end + self.gridList[index].costList[i].go.gameObject:SetActive(true) - if index <= self.lv + 1 then - self.gridList[index].tip.text = "需要:" --未解锁红色 - - self.gridList[index].costGrid.gameObject:SetActive(true) - for i = 1,math.max(#self.gridList[index].costList,#self.godDatas[index]) do - if not self.godDatas[index][i] then - self.gridList[index].costList[i].go.gameObject:SetActive(false) - else - if not self.gridList[index].costList[i] then - self.gridList[index].costList[i] = {} - self.gridList[index].costList[i].go = newObjToParent(self.costPre,self.gridList[index].costGrid) - self.gridList[index].costList[i].frame = Util.GetGameObject(self.gridList[index].costList[i].go,"frame"):GetComponent("Image") - self.gridList[index].costList[i].icon = Util.GetGameObject(self.gridList[index].costList[i].frame.transform,"icon"):GetComponent("Image") - self.gridList[index].costList[i].num = Util.GetGameObject(self.gridList[index].costList[i].go,"num"):GetComponent("Text") - end - self.gridList[index].costList[i].go.gameObject:SetActive(true) - - if self.godDatas[index][i].id > 0 then - if self.godDatas[index][i].star > 10 then - self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_zuanshitouxiangkuang") - else - self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_hong") - end - self.gridList[index].costList[i].icon.gameObject:SetActive(true) - self.gridList[index].costList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[self.godDatas[index][i].id].Icon)) - elseif self.godDatas[index][i].property > 0 then - self.gridList[index].costList[i].icon.gameObject:SetActive(false) - self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(PropertySmallIcon[self.godDatas[index][i].star][self.godDatas[index][i].property]) - elseif self.godDatas[index][i].profession > 0 then - self.gridList[index].costList[i].icon.gameObject:SetActive(false) - self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(GodSoulProfession[self.godDatas[index][i].star][self.godDatas[index][i].profession]) + if self.godDatas[index][i].id > 0 then + if self.godDatas[index][i].star > 10 then + self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_zuanshitouxiangkuang") else - self.gridList[index].costList[i].icon.gameObject:SetActive(false) - self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(StarImage[self.godDatas[index][i].star]) - end - - if index == self.lv + 1 then --未激活时红色,图标置灰 - self.gridList[index].costList[i].num.text = string.format("×%s",self.godDatas[index][i].num) - Util.SetGray(self.gridList[index].costList[i].frame.gameObject,true) - else --激活时绿色,图标不置灰 - self.gridList[index].costList[i].num.text = string.format("×%s",self.godDatas[index][i].num) - Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false) + self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_hong") end + self.gridList[index].costList[i].icon.gameObject:SetActive(true) + self.gridList[index].costList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[self.godDatas[index][i].id].Icon)) + elseif self.godDatas[index][i].property > 0 then + self.gridList[index].costList[i].icon.gameObject:SetActive(false) + self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(PropertySmallIcon[self.godDatas[index][i].star][self.godDatas[index][i].property]) + elseif self.godDatas[index][i].profession > 0 then + self.gridList[index].costList[i].icon.gameObject:SetActive(false) + self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(GodSoulProfession[self.godDatas[index][i].star][self.godDatas[index][i].profession]) + else + self.gridList[index].costList[i].icon.gameObject:SetActive(false) + self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(StarImage[self.godDatas[index][i].star]) + end + if not self.addShow then + self.gridList[index].costList[i].num.text = string.format("×%s",self.godDatas[index][i].num) + Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false) + elseif index == self.lv + 1 then --未激活时红色,图标置灰 + self.gridList[index].costList[i].num.text = string.format("×%s",self.godDatas[index][i].num) + Util.SetGray(self.gridList[index].costList[i].frame.gameObject,true) + else --激活时绿色,图标不置灰 + self.gridList[index].costList[i].num.text = string.format("×%s",self.godDatas[index][i].num) + Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false) end end + end + self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 + if not self.addShow then + self.gridList[index].tip.text = "需要:" --未解锁红色 + self.gridList[index].costGrid.gameObject:SetActive(true) + self.gridList[index].add.gameObject:SetActive(false) + Util.SetGray(self.gridList[index].godGrid,false) + Util.SetGray(self.gridList[index].des.gameObject,false) + self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 + elseif index <= self.lv + 1 then + self.gridList[index].tip.text = "需要:" --未解锁红色 + self.gridList[index].costGrid.gameObject:SetActive(true) self.gridList[index].add.gameObject:SetActive(true) if index == self.lv + 1 then Util.SetGray(self.gridList[index].godGrid,true) --勾魂图标 未激活时置灰 - --Util.SetGray(self.gridList[index].tip.gameObject,true) Util.SetGray(self.gridList[index].des.gameObject,true) else Util.SetGray(self.gridList[index].godGrid,false) - --Util.SetGray(self.gridList[index].tip.gameObject,false) Util.SetGray(self.gridList[index].des.gameObject,false) end else @@ -154,7 +170,6 @@ function RoleGodSoulLayout:UpdataSingleGod(index) --红色 self.gridList[index].tip.text = string.format("激活%s级神魂后解锁:",index - 1) Util.SetGray(self.gridList[index].godGrid,true) - Util.SetGray(self.gridList[index].tip.gameObject,false) Util.SetGray(self.gridList[index].des.gameObject,true) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 41951c7bef..f764e6366d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -624,7 +624,12 @@ function this:UpdateHeroInfoData() local starSize = Vector2.New(60,60) local star,starType = curHeroData.GetStar(2) - SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,-10,Vector2.New(0.5,0.5)) + local starScale = -10 + if starType == 3 then + starSize = Vector2.New(55.3,138.2) + starScale = -13.2 + end + SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale)--,Vector2.New(0.5,0.5)) this.posImage.sprite =this.spLoader:LoadSprite(curHeroData.professionIcon) this.heroName.text = curHeroData.name this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) @@ -675,6 +680,7 @@ function this:UpdateHeroInfoData() else this.imprintBtn:SetActive(false) end + ForceRebuildLayout(this.starGrid.transform) end function this:ChangeCurentHeroSkinLive(herodata) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 84e9aab072..5729e476ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -252,7 +252,13 @@ function this.SingleHeroDataShow(_go,_heroData) local starPre = Util.GetGameObject(_go.transform, "starPre") --Util.ClearChild(starGrid.transform) local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, starGrid, star,starType,Vector2(32.5,32.5),-10) + local starSize = Vector2.New(32.5,32.5) + local starScale = -10 + if starType == 3 then + starSize = Vector2.New(35.75,89.42) + starScale = -13.2 + end + SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) --local cardBtn = Util.GetGameObject(_go.transform, "card(Clone)") SoulPrintManager.UnLockSoulPrintPos(heroData) local soulPrintIsOpen = table.nums(SoulPrintManager.hasUnlockPos)>=1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua index 5477306f53..22cadf31ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua @@ -85,7 +85,11 @@ function this.OnShowSingleCardData(go,heroData) Util.GetGameObject(formationMask.transform, "lockImage"):SetActive( heroData.lockState == 1) local starGrid = Util.GetGameObject(go.transform, "star") local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, starGrid, star,starType,nil,-15) + local starScale = -15 + if starType == 3 then + starScale = -16.86 + end + SetHeroStars(this.spLoader, starGrid, star,starType,nil,starScale) local cardBtn = Util.GetGameObject(go.transform, "icon") Util.AddOnceClick(cardBtn, function() diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index d2ea4beeee..cdd9bab274 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -547,7 +547,11 @@ function this.SetTeamInfo(_go,teamData,type) heroGo:SetActive(true) Util.GetGameObject(heroGo, "starGrid").transform.localScale=Vector3.one*0.7 local star,starType = GetStarOrGodSoulLv(1,hero) - SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,nil,-15) + local starScale = -15 + if starType == 3 then + starScale = -16 + end + SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,nil,starScale) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level diff --git a/Assets/ManagedResources/~Lua/View/RoleItemView.lua b/Assets/ManagedResources/~Lua/View/RoleItemView.lua index e610b0f216..3e27155287 100644 --- a/Assets/ManagedResources/~Lua/View/RoleItemView.lua +++ b/Assets/ManagedResources/~Lua/View/RoleItemView.lua @@ -62,6 +62,12 @@ function RoleItemView:OnOpen(_heroDId,_isShowHeroName,_isShowHeroHp,_hpVal,_effe end function RoleItemView:OnShowHeroData(effectLayer) local star,starType = self.heroData.GetStar(1) or self.heroData.heroConfig.Star + local starSize = Vector2.New(32,32) + local starScale = -10 + if starType == 3 then + starSize = Vector2.New(35.75,89.42) + starScale = -13 + end SetHeroBg(this.spLoader, Util.GetGameObject(self.gameObject, "iconMask"),self.frame,star,self.heroData.heroConfig.Quality) self.icon.sprite = this.spLoader:LoadSprite(self.heroData.painting) self.lv.text=self.heroData.lv @@ -71,7 +77,7 @@ function RoleItemView:OnShowHeroData(effectLayer) self.roleEffect:SetActive(self.heroData.star >= 5)-- Util.AddParticleSortLayer(self.roleEffect, effectLayer - self.EffectOrginLayer) self.EffectOrginLayer = effectLayer - SetHeroStars(this.spLoader, self.starGrid,star,starType,Vector2.New(32,32),-10) + SetHeroStars(this.spLoader, self.starGrid,star,starType,starSize,starScale) self.heroNameText.text=GetLanguageStrById(self.heroData.heroConfig.ReadingName) if self.hpVal and self.isShowHeroHp then