diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/f_fushengmeni_dongfu.png b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/f_fushengmeni_dongfu.png
deleted file mode 100644
index 51a50330ad..0000000000
Binary files a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/f_fushengmeni_dongfu.png and /dev/null differ
diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon.png b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon.png
new file mode 100644
index 0000000000..aaa15014c3
Binary files /dev/null and b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon.png differ
diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/f_fushengmeni_dongfu.png.meta b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon.png.meta
similarity index 96%
rename from Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/f_fushengmeni_dongfu.png.meta
rename to Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon.png.meta
index b67bc10f1e..baa7a5ec71 100644
--- a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/f_fushengmeni_dongfu.png.meta
+++ b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e08e760df004e40449bb795636b86a73
+guid: 533854eb1b8d3e241beede53b4167593
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: a8c260b32093a8a45a2096049f9b9184
+ spriteID: a88191cd02eea1f4ea19a0e0eb4b84de
vertices: []
indices:
edges: []
diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon001.png b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon001.png
new file mode 100644
index 0000000000..79cc4f58b0
Binary files /dev/null and b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon001.png differ
diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon001.png.meta b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon001.png.meta
new file mode 100644
index 0000000000..b6093130fa
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/HomeLandAtlas/ArtFont/r_tongyong_tequan_icon001.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: da96344839376de469dea909ba9588b4
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 75fedfff795ca884daf5752f955d4deb
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: HomeLandAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/z_icon_baijin_bao.png b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/z_icon_baijin_bao.png
index 0fed8d7a34..b45b913370 100644
Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/z_icon_baijin_bao.png and b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/z_icon_baijin_bao.png differ
diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu.png
new file mode 100644
index 0000000000..9bbad96a78
Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu.png differ
diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu.png.meta
new file mode 100644
index 0000000000..93f8faae0a
--- /dev/null
+++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 2d66149bce2b33545afd47bc0cf5f9ba
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 57
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: b37f578422198264eaa605ad52e0eb63
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu001.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu001.png
new file mode 100644
index 0000000000..f5ff9aceec
Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu001.png differ
diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu001.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu001.png.meta
new file mode 100644
index 0000000000..cb219478d2
--- /dev/null
+++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/r_zjm_icon-dongfu001.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: a133061624f7ab041b6c1ca271853319
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 57
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 4f3fb37d915b9754ba9c5b954aa395a0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icon/Item/f_fushengmeni_dongfu_icon.png b/Assets/ManagedResources/Icon/Item/f_fushengmeni_dongfu_icon.png
index 4a80d48470..7c21202b59 100644
Binary files a/Assets/ManagedResources/Icon/Item/f_fushengmeni_dongfu_icon.png and b/Assets/ManagedResources/Icon/Item/f_fushengmeni_dongfu_icon.png differ
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
index 6753e7aac3..233afcd734 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
@@ -12745,7 +12745,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u6D6E\u751F\u95E8\u5404\u8D44\u6E90\u5EFA\u7B51\uFF08\u7389\u6E05\u5C45\u3001\u7948\u798F\u658B\u3001\u671B\u6708\u5C45\uFF09\u4EA7\u91CF\u589E\u52A020%"
+ m_Text: "\u6D1E\u5E9C\u5404\u8D44\u6E90\u5EFA\u7B51\uFF08\u7389\u6E05\u5C45\u3001\u7948\u798F\u658B\u3001\u671B\u6708\u5C45\uFF09\u4EA7\u91CF\u589E\u52A020%"
LanguageIndex: 0
--- !u!1 &9055556018580535638
GameObject:
diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab
index ac0265c6c4..7b7630a5ca 100644
--- a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab
@@ -3052,7 +3052,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: e08e760df004e40449bb795636b86a73, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 533854eb1b8d3e241beede53b4167593, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -8624,7 +8624,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
- m_Transition: 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}
@@ -24227,6 +24227,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7126930402637738260}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -24332,11 +24337,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@@ -24357,6 +24357,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7328121124282680815}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -24462,11 +24467,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@@ -24767,6 +24767,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2929527279963613486}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -24872,11 +24877,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@@ -25037,6 +25037,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8115893985862711295}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -25142,11 +25147,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@@ -25307,6 +25307,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4567849875460340345}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -25412,11 +25417,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@@ -25437,6 +25437,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2787930079669500062}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -25542,11 +25547,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@@ -25567,6 +25567,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7843093090422364795}
m_Modifications:
+ - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
+ type: 3}
+ propertyPath: m_Name
+ value: c_shengji
+ objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -25672,11 +25677,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
- type: 3}
- propertyPath: m_Name
- value: c_shengji
- objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
diff --git a/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab
index 1882a4be0a..dd4e4ca28b 100644
--- a/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab
@@ -74,80 +74,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &412219405
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 412219406}
- - component: {fileID: 412219408}
- - component: {fileID: 412219407}
- m_Layer: 5
- m_Name: di
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &412219406
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 412219405}
- 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: 6100468993864897443}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &412219408
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 412219405}
- m_CullTransparentMesh: 0
---- !u!114 &412219407
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 412219405}
- 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: 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_Sprite: {fileID: 21300000, guid: ebe3fcbf206dfdb4591ae523498366cc, 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 &531690776
GameObject:
m_ObjectHideFlags: 0
@@ -335,7 +261,7 @@ RectTransform:
- {fileID: 2124249695}
- {fileID: 8162072501622411793}
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 12
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -687,7 +613,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 11
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -848,7 +774,7 @@ RectTransform:
- {fileID: 6322198127485678409}
- {fileID: 801832922018237753}
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -889,7 +815,7 @@ RectTransform:
- {fileID: 753002028}
- {fileID: 1241315938}
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1771,7 +1697,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 5
+ 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}
@@ -1892,7 +1818,7 @@ RectTransform:
m_Children:
- {fileID: 731539000061373980}
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -1968,7 +1894,7 @@ RectTransform:
- {fileID: 1289564337433559313}
- {fileID: 2156384405716919073}
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@@ -2117,7 +2043,7 @@ RectTransform:
m_Children:
- {fileID: 7588739653103211287}
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@@ -2462,7 +2388,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1595442151499135104}
- - {fileID: 412219406}
- {fileID: 1125464669666314855}
- {fileID: 7687680957590466058}
- {fileID: 5928475536814580870}
@@ -2566,7 +2491,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2700,7 +2625,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2780,7 +2705,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: ebe3fcbf206dfdb4591ae523498366cc, type: 3}
+ m_Sprite: {fileID: 21300000, guid: d9eb47e7e33ca8a4aa13a0de17b927ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2818,7 +2743,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
- m_RootOrder: 4
+ 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}
diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
index 578678d2bc..c34d2feb39 100644
--- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
@@ -635,7 +635,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 857c2a13063298f42bd9fa82cee9e6bb, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a133061624f7ab041b6c1ca271853319, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -79253,7 +79253,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 857c2a13063298f42bd9fa82cee9e6bb, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a133061624f7ab041b6c1ca271853319, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -79327,7 +79327,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: cf9207026c0e90440a52de012634a6e8, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 2d66149bce2b33545afd47bc0cf5f9ba, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab
index 90f0958667..8dd29720a2 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab
@@ -334,7 +334,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: 361.65, y: -0.00004781601}
+ m_AnchoredPosition: {x: 361.65, y: -0.000024327841}
m_SizeDelta: {x: 723.3, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &7575507291051525301
@@ -1021,6 +1021,114 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u603B\u597D\u611F\u5EA6\u8BE6\u60C5"
+--- !u!1 &6373281428889468089
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8863066759887306331}
+ - component: {fileID: 4076802643779648760}
+ - component: {fileID: 2063618818738508488}
+ - component: {fileID: 8628305858574940229}
+ m_Layer: 5
+ m_Name: emptyBtn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8863066759887306331
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6373281428889468089}
+ 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: 7723528773779627565}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 166.9}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4076802643779648760
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6373281428889468089}
+ 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: 0
+ 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: 8628305858574940229}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!222 &2063618818738508488
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6373281428889468089}
+ m_CullTransparentMesh: 0
+--- !u!114 &8628305858574940229
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6373281428889468089}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &6434621879045362286
GameObject:
m_ObjectHideFlags: 0
@@ -1227,6 +1335,7 @@ RectTransform:
- {fileID: 9090717114976058863}
- {fileID: 7479768761916316215}
- {fileID: 5601896589029272011}
+ - {fileID: 8863066759887306331}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab
index 405a997849..ed232c1500 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab
@@ -578,7 +578,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -1149,6 +1149,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1379024719259137859
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1624075167515823848}
+ - component: {fileID: 1281103023511003005}
+ - component: {fileID: 6134737023415600531}
+ m_Layer: 5
+ m_Name: Image (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1624075167515823848
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1379024719259137859}
+ m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3319228929955057930}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 197.9, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1281103023511003005
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1379024719259137859}
+ m_CullTransparentMesh: 0
+--- !u!114 &6134737023415600531
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1379024719259137859}
+ 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: d76bc0d44fec6ef49a1671ebc472dc3d, 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 &1510964445479858592
GameObject:
m_ObjectHideFlags: 0
@@ -2579,6 +2653,7 @@ RectTransform:
- {fileID: 5493559332277853408}
- {fileID: 8121610969977954679}
- {fileID: 8121286746226876291}
+ - {fileID: 5255180600956336007}
- {fileID: 8121509655733184479}
- {fileID: 8122048255938460243}
- {fileID: 416973121401857260}
@@ -2770,7 +2845,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -2785,6 +2860,51 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &2949199107016231387
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4728332404894481503}
+ - component: {fileID: 8672676174633534214}
+ m_Layer: 5
+ m_Name: line1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4728332404894481503
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2949199107016231387}
+ 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: 8907323562298612048}
+ m_Father: {fileID: 5255180600956336007}
+ 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: 10, y: 204}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8672676174633534214
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2949199107016231387}
+ m_CullTransparentMesh: 0
--- !u!1 &2953478171144744166
GameObject:
m_ObjectHideFlags: 0
@@ -3044,7 +3164,7 @@ RectTransform:
- {fileID: 6093010699607229902}
- {fileID: 8910204329345976168}
m_Father: {fileID: 7662967509015272728}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -3059,6 +3179,134 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3002861940390390241}
m_CullTransparentMesh: 0
+--- !u!1 &3044124659611130103
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5860947083046197232}
+ - component: {fileID: 1841575713727255548}
+ - component: {fileID: 8154889725673791788}
+ - component: {fileID: 551202668395586494}
+ - component: {fileID: 4473668016805929524}
+ m_Layer: 5
+ m_Name: sBg4
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5860947083046197232
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3044124659611130103}
+ 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: 5255180600956336007}
+ 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: 150, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1841575713727255548
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3044124659611130103}
+ m_CullTransparentMesh: 0
+--- !u!114 &8154889725673791788
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3044124659611130103}
+ 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: 6769999928302761298}
+ 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 &551202668395586494
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3044124659611130103}
+ 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 &4473668016805929524
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3044124659611130103}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &3120615548800797796
GameObject:
m_ObjectHideFlags: 0
@@ -3303,8 +3551,6 @@ GameObject:
- component: {fileID: 2438891260866426133}
- component: {fileID: 2731153773792852711}
- component: {fileID: 3583595252862437607}
- - component: {fileID: 630579159354592167}
- - component: {fileID: 2503902279397923558}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
@@ -3353,7 +3599,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -3368,13 +3614,60 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &630579159354592167
+--- !u!1 &3639841066666479861
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4250998618015532363}
+ - component: {fileID: 5716206532899927529}
+ - component: {fileID: 4953780380220208119}
+ - component: {fileID: 8972023138657115194}
+ - component: {fileID: 9103761057048970948}
+ m_Layer: 5
+ m_Name: sBg3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4250998618015532363
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3639841066666479861}
+ 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: 5255180600956336007}
+ 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: 150, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5716206532899927529
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3639841066666479861}
+ m_CullTransparentMesh: 0
+--- !u!114 &4953780380220208119
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3474527349178146698}
+ m_GameObject: {fileID: 3639841066666479861}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -3404,20 +3697,20 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 3583595252862437607}
+ m_TargetGraphic: {fileID: 6769999928302761298}
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 &2503902279397923558
+--- !u!95 &8972023138657115194
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3474527349178146698}
+ m_GameObject: {fileID: 3639841066666479861}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
@@ -3429,6 +3722,26 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &9103761057048970948
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3639841066666479861}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &3697084287494790549
GameObject:
m_ObjectHideFlags: 0
@@ -4011,6 +4324,112 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4131199820810104717
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5255180600956336007}
+ - component: {fileID: 5192099784658756341}
+ - component: {fileID: 9157803400150034246}
+ - component: {fileID: 2603370971112601185}
+ m_Layer: 5
+ m_Name: skillBtns
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5255180600956336007
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4131199820810104717}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.85, y: 0.85, z: 1}
+ m_Children:
+ - {fileID: 161976341450026371}
+ - {fileID: 5417920620491975518}
+ - {fileID: 4728332404894481503}
+ - {fileID: 4250998618015532363}
+ - {fileID: 5860947083046197232}
+ - {fileID: 3319228929955057930}
+ - {fileID: 4654087253886555502}
+ m_Father: {fileID: 7662967509015272728}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.041259766, y: -263.6}
+ m_SizeDelta: {x: 190.59998, y: 248.8}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5192099784658756341
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4131199820810104717}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 98
+ m_Right: 94
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+--- !u!223 &9157803400150034246
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4131199820810104717}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 201
+ m_TargetDisplay: 0
+--- !u!114 &2603370971112601185
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4131199820810104717}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &4248333853503787974
GameObject:
m_ObjectHideFlags: 0
@@ -4866,6 +5285,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4890918139042890437
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8907323562298612048}
+ - component: {fileID: 9017375934769245801}
+ - component: {fileID: 7260060602004300663}
+ m_Layer: 5
+ m_Name: Image (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8907323562298612048
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4890918139042890437}
+ m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4728332404894481503}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 197.9, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9017375934769245801
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4890918139042890437}
+ m_CullTransparentMesh: 0
+--- !u!114 &7260060602004300663
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4890918139042890437}
+ 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: d76bc0d44fec6ef49a1671ebc472dc3d, 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 &4921799015063642220
GameObject:
m_ObjectHideFlags: 0
@@ -5188,7 +5681,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -5744,8 +6237,6 @@ GameObject:
- component: {fileID: 2379649357801959356}
- component: {fileID: 433513015497119588}
- component: {fileID: 6769999928302761298}
- - component: {fileID: 6611250916132714393}
- - component: {fileID: 3222065629840982913}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
@@ -5794,7 +6285,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -5809,67 +6300,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &6611250916132714393
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5560152272962162745}
- 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: 6769999928302761298}
- 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 &3222065629840982913
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5560152272962162745}
- 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!1 &5602953268905096244
GameObject:
m_ObjectHideFlags: 0
@@ -6118,6 +6548,134 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
+--- !u!1 &5925215107982699743
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5417920620491975518}
+ - component: {fileID: 5994793823569536853}
+ - component: {fileID: 2121280601073153181}
+ - component: {fileID: 2140558930021473358}
+ - component: {fileID: 7763286960992972077}
+ m_Layer: 5
+ m_Name: sBg2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5417920620491975518
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5925215107982699743}
+ 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: 5255180600956336007}
+ 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: 150, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5994793823569536853
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5925215107982699743}
+ m_CullTransparentMesh: 0
+--- !u!114 &2121280601073153181
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5925215107982699743}
+ 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: 6769999928302761298}
+ 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 &2140558930021473358
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5925215107982699743}
+ 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 &7763286960992972077
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5925215107982699743}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &5935343174521886068
GameObject:
m_ObjectHideFlags: 0
@@ -6502,8 +7060,6 @@ GameObject:
- component: {fileID: 4759057411216424097}
- component: {fileID: 3572788638532369534}
- component: {fileID: 237870584333894024}
- - component: {fileID: 2045620560944287756}
- - component: {fileID: 5752952834536577105}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
@@ -6552,7 +7108,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -6567,67 +7123,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &2045620560944287756
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6288122636954346029}
- 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: 237870584333894024}
- 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 &5752952834536577105
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6288122636954346029}
- 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!1 &6326940851402664987
GameObject:
m_ObjectHideFlags: 0
@@ -6748,6 +7243,51 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &6432919324336828984
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3319228929955057930}
+ - component: {fileID: 6455350720428653631}
+ m_Layer: 5
+ m_Name: line2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &3319228929955057930
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6432919324336828984}
+ 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: 1624075167515823848}
+ m_Father: {fileID: 5255180600956336007}
+ 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: 10, y: 204}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6455350720428653631
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6432919324336828984}
+ m_CullTransparentMesh: 0
--- !u!1 &6456082303178093830
GameObject:
m_ObjectHideFlags: 0
@@ -7318,6 +7858,134 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 352929
+--- !u!1 &7336667485875226949
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4654087253886555502}
+ - component: {fileID: 2056183318898278240}
+ - component: {fileID: 7868566763912537923}
+ - component: {fileID: 6178799772300474086}
+ - component: {fileID: 390764690348613691}
+ m_Layer: 5
+ m_Name: sBg5
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4654087253886555502
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7336667485875226949}
+ 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: 5255180600956336007}
+ 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: 150, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2056183318898278240
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7336667485875226949}
+ m_CullTransparentMesh: 0
+--- !u!114 &7868566763912537923
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7336667485875226949}
+ 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: 6769999928302761298}
+ 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 &6178799772300474086
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7336667485875226949}
+ 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 &390764690348613691
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7336667485875226949}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &7561579627433864529
GameObject:
m_ObjectHideFlags: 0
@@ -7552,6 +8220,134 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &7638451547323958429
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 161976341450026371}
+ - component: {fileID: 3863566189805288760}
+ - component: {fileID: 4555601750550084285}
+ - component: {fileID: 3594162958027461840}
+ - component: {fileID: 1163982263636566424}
+ m_Layer: 5
+ m_Name: sBg1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &161976341450026371
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7638451547323958429}
+ 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: 5255180600956336007}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 150, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3863566189805288760
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7638451547323958429}
+ m_CullTransparentMesh: 0
+--- !u!114 &4555601750550084285
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7638451547323958429}
+ 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: 6769999928302761298}
+ 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 &3594162958027461840
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7638451547323958429}
+ 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 &1163982263636566424
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7638451547323958429}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &7681489402829919363
GameObject:
m_ObjectHideFlags: 0
@@ -8149,7 +8945,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -8330,7 +9126,7 @@ RectTransform:
m_Children:
- {fileID: 8777164316250289578}
m_Father: {fileID: 7662967509015272728}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -9035,7 +9831,7 @@ RectTransform:
- {fileID: 7840164508322653572}
- {fileID: 6204830670884386256}
m_Father: {fileID: 7662967509015272728}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
@@ -9052,8 +9848,6 @@ GameObject:
m_Component:
- component: {fileID: 8121286746226876291}
- component: {fileID: 8124780028357906616}
- - component: {fileID: 5488706725289087337}
- - component: {fileID: 1417515970342626066}
m_Layer: 5
m_Name: skill
m_TagString: Untagged
@@ -9112,44 +9906,6 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
---- !u!223 &5488706725289087337
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8335544241066286179}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 2
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 1
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
- m_SortingLayerID: 0
- m_SortingOrder: 201
- m_TargetDisplay: 0
---- !u!114 &1417515970342626066
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8335544241066286179}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
--- !u!1 &8335999088447926411
GameObject:
m_ObjectHideFlags: 0
@@ -9180,7 +9936,7 @@ RectTransform:
- {fileID: 9186058842537390145}
- {fileID: 8121423035960145381}
m_Father: {fileID: 7662967509015272728}
- m_RootOrder: 8
+ 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}
@@ -9667,8 +10423,6 @@ GameObject:
- component: {fileID: 6689197826625742543}
- component: {fileID: 8451398194467933084}
- component: {fileID: 6517797900713296394}
- - component: {fileID: 1658577495796030875}
- - component: {fileID: 7328181570757203420}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
@@ -9717,7 +10471,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -9732,67 +10486,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &1658577495796030875
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8748553370568657714}
- 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: 6517797900713296394}
- 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 &7328181570757203420
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8748553370568657714}
- 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!1 &8801696786364957231
GameObject:
m_ObjectHideFlags: 0
@@ -9954,8 +10647,6 @@ GameObject:
- component: {fileID: 4566107094710583954}
- component: {fileID: 4108991031143114371}
- component: {fileID: 512484378597774925}
- - component: {fileID: 8562254902593408226}
- - component: {fileID: 4552056749788009876}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
@@ -10004,7 +10695,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 810c45dafbe82034d9ccbb68c020207a, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -10019,67 +10710,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!114 &8562254902593408226
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8861864498338991698}
- 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: 512484378597774925}
- 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 &4552056749788009876
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8861864498338991698}
- 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!1 &8888196964995249470
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
index 5c3900392a..b9f3babdff 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
@@ -57624,9 +57624,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 116, y: -42}
+ m_AnchoredPosition: {x: 116, y: -212.78503}
m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0}
--- !u!114 &7854679572375693773
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab
index 3ebe1a8e04..f92d628a68 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab
@@ -973,6 +973,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4664733373664257448}
+ - component: {fileID: 1006335373756226833}
+ - component: {fileID: 5629987156951340734}
+ - component: {fileID: 3467222186231562738}
m_Layer: 5
m_Name: likeability
m_TagString: Untagged
@@ -1004,6 +1007,76 @@ RectTransform:
m_AnchoredPosition: {x: 39.224964, y: -212.9}
m_SizeDelta: {x: 588, y: 185.80005}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1006335373756226833
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4863201152149951662}
+ 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: 0
+ 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: 0}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!222 &5629987156951340734
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4863201152149951662}
+ m_CullTransparentMesh: 0
+--- !u!114 &3467222186231562738
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4863201152149951662}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &5761760000363587408
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua
index 897b355187..4aa19ca855 100644
--- a/Assets/ManagedResources/~Lua/Common/functions.lua
+++ b/Assets/ManagedResources/~Lua/Common/functions.lua
@@ -863,6 +863,23 @@ function GetStr(data)
return str
end
+function GetBgByHeroNatural(id)
+ if id == 1 then
+ return "r_characterbg_goden"
+ elseif id == 2 then
+ return "r_characterbg_goden"
+ elseif id == 3 then
+ return "r_characterbg_goden"
+ elseif id == 4 then
+ return "r_characterbg_goden"
+ elseif id == 5 then
+ return "r_characterbg_gules"
+ elseif id == 6 then
+ return "t_tongyong_topkaung"
+ elseif id == 7 then
+ return "t_tongyong_topkaung"
+ end
+end
--通过item稀有度读取背景框
function GetQuantityImageByquality(quality,star)
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua
index 5ed3234e77..9b6bdd5114 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua
@@ -25,7 +25,7 @@ function this:InitComponent(gameObject)
for i = 1, 3 do
self.wishListObj[i] = Util.GetGameObject(gameObject,"wishList/hero ("..i..")")
self.bgObjlist[i] = Util.GetGameObject(gameObject,"Bg/bglist/obj"..i)
- Util.GetGameObject(self.bgObjlist[i], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_topkaung")
+ Util.GetGameObject(self.bgObjlist[i], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite("r_characterbg_goden")
end
--tabList
self.tabListObj = {}
@@ -99,7 +99,6 @@ function this:SetUpHero()
for i = 1, 3 do
local go = self.wishListObj[i]
local frame = Util.GetGameObject(go, "frame"):GetComponent("Image")
- frame.sprite = self.spLoader:LoadSprite("t_tongyong_topkaung")
local icon = Util.GetGameObject(go, "icon"):GetComponent("Image")
local proIcon = Util.GetGameObject(go, "proIcon"):GetComponent("Image")
local starGrid = Util.GetGameObject(go, "star")
@@ -109,7 +108,7 @@ function this:SetUpHero()
if heroId > 0 then
go:SetActive(true)
local heroData = heroConfig[heroId]
-
+ frame.sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.Natural))
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
SetHeroStars(self.spLoader,starGrid, heroData.Star)
@@ -142,7 +141,7 @@ end
function this:ShowSingleHero(go,data,index)
local heroData = heroConfig[data.Reward[1]]
self.itemList[self.curSelect][index] = go
- Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_topkaung")
+ Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.Natural))
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.ReadingName
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua
index 5686f6beb9..da90f1e9fc 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua
@@ -50,7 +50,7 @@ end
function this:Refresh()
- this.text1.text = "浮生门各资源建筑(玉清居、祈福斋、望月居)产量增加20%"
+ this.text1.text = "洞府各资源建筑(玉清居、祈福斋、望月居)产量增加20%"
this.text2.text = "每日可使用五次特权加速功能,每次可减少8小时建筑升级时间"
this.leftTime.text = "购买后持续30天"
diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua
index 44c530e16b..c8458e9b04 100644
--- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua
@@ -460,6 +460,7 @@ function HomeLand:SetTime()
self.timer:Stop()
self.timer = nil
end
+ Util.SetGray(self.Privi,not HomeLandManager.activePrivilege)
self.timer = Timer.New(function ()
for i = 1, 7 do
local curObj = self.mapData[i]
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
index 8360ffd011..3a48a65a6c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
@@ -173,7 +173,11 @@ end
function GeneralPopup:OnShow()
if index == GENERAL_POPUP_TYPE.RecruitBox then--临时接的参数 需要onshow刷新的调用
- contentScripts[index].view:OnShow(this,unpack(onOpenArgs, 1, table.maxn(onOpenArgs)))
+ if onOpenArgs then
+ contentScripts[index].view:OnShow(this,unpack(onOpenArgs, 1, table.maxn(onOpenArgs)))
+ else
+ contentScripts[index].view:OnShow(this)
+ end
end
this.backBtn:SetActive(index ~= GENERAL_POPUP_TYPE.SheJiCheckGuild)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua
index b49a8c6b79..48f01b06a4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua
@@ -133,7 +133,7 @@ function this.SingleHeroDataShow(go,_heroData,_index)
proIcon.gameObject:SetActive(false)
starGrid:SetActive(false)
end
- if curPage == 5 then
+ if curPage ~= 5 then
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
else
frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua
index 505423a0b4..f5fe87f53f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua
@@ -201,6 +201,7 @@ function RecruitPanelNew:UpdataWishPanel()
if id > 0 then
self.upHeroPreList[i].item.gameObject:SetActive(true)
self.upHeroPreList[i].item:OnOpen(false, {id,0},1, false, false, false, self.sortingOrder)
+ self.upHeroPreList[i].item.frame.sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(ConfigManager.GetConfigData(ConfigName.HeroConfig,id).Natural))
self.upHeroPreList[i].choosed:SetActive(data.status == 1)
else
self.upHeroPreList[i].item.gameObject:SetActive(false)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
index a6ef49e4af..3e8f5524af 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
@@ -70,9 +70,12 @@ function RoleInfoLayout:InitComponent()
this.posInfo = Util.GetGameObject(this.posBtn,"PosInfo"):GetComponent("Text")
this.proTip = Util.GetGameObject(self.gameObject,"content/pro/tishi")
this.skillGrid=Util.GetGameObject(self.gameObject,"content/skill")
- this.skillGridCanvas = this.skillGrid:GetComponent("Canvas")
+
this.selsectSkillImage=Util.GetGameObject(this.skillGrid,"selsectSkillImage")
this.skillList = {}
+ this.skillBtnsList = {}
+ this.skillBtnsRoot = Util.GetGameObject(self.gameObject,"content/skillBtns")
+ this.skillGridCanvas = this.skillBtnsRoot:GetComponent("Canvas")
for i = 1,5 do
this.skillList[i] = {}
this.skillList[i].go = Util.GetGameObject(this.skillGrid,"sBg"..i)
@@ -83,9 +86,12 @@ function RoleInfoLayout:InitComponent()
this.skillList[i].skillName = Util.GetGameObject(this.skillList[i].go,"skillName"):GetComponent("Text")
this.skillList[i].skillIma = Util.GetGameObject(this.skillList[i].go,"image")
this.skillList[i].frame = Util.GetGameObject(this.skillList[i].go,"frame"):GetComponent("Image")
+ this.skillBtnsList[i] = Util.GetGameObject(this.skillBtnsRoot,"sBg"..i)
end
this.line1 = Util.GetGameObject(this.skillGrid,"line1")
this.line2 = Util.GetGameObject(this.skillGrid,"line2")
+ this.line3 = Util.GetGameObject(this.skillBtnsRoot,"line1")
+ this.line4 = Util.GetGameObject(this.skillBtnsRoot,"line2")
this.upLv = Util.GetGameObject(self.gameObject,"content/upLv")
--升级
@@ -192,11 +198,6 @@ function RoleInfoLayout:RemoveListener()
end
function this.SkillInfoPopupClose(panelType, p)
- if panelType == UIName.SkillInfoPopup and this.skillPanel == p then --监听到SkillInfoPopup关闭,把层级设回去
- this.selsectSkillImage:SetActive(false)
- this.skillPanel = nil
- this.skillGridCanvas.sortingOrder = this.sortingOrder + 1
- end
end
function RoleInfoLayout:OnShow()
@@ -216,6 +217,7 @@ function RoleInfoLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_he
--角色定位按钮
this.posBtn.gameObject:SetActive(curHeroData.heroConfig.ShowHeroLocation==1)
this.posInfo.text = curHeroData.heroConfig.HeroLocationDesc1
+ ForceRebuildLayout(this.posBtn.transform)
end
--更新英雄情报数据
@@ -534,7 +536,7 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki
Util.SetGray(this.skillList[i].go,false)
end
Util.AddOnceClick(this.skillList[i].icon.gameObject, function()
- this.SetSelectSkillImage(this.skillList[i].icon.gameObject)
+ this.SetSelectSkillImage(this.skillList[i].icon.gameObject)
local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,this.skillData[i].skillConfig.Type)
if this.skillData[i].skillType == 0 then
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId))
@@ -560,16 +562,20 @@ end
--单个技能显示
function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills)
+ this.skillPanelId = 0
this.skillGridCanvas.sortingOrder = this.sortingOrder + 1
this.skillData = this.GetSkillsData()
for i = 1,math.max(#this.skillList,#this.skillData) do
- this.skillList[i].icon.gameObject:GetComponent("Button").onClick:RemoveAllListeners()
+ this.skillBtnsList[i].gameObject:GetComponent("Button").onClick:RemoveAllListeners()
if not this.skillData[i] then
this.skillList[i].go.gameObject:SetActive(false)
+ this.skillBtnsList[i].gameObject:SetActive(false)
elseif this.skillData[i].state == -1 then
this.skillList[i].go.gameObject:SetActive(false)
+ this.skillBtnsList[i].gameObject:SetActive(false)
else
this.skillList[i].go.gameObject:SetActive(true)
+ this.skillBtnsList[i].gameObject:SetActive(true)
if this.skillData[i].quality == 0 then
this.skillList[i].frame.gameObject:SetActive(false)
else
@@ -602,42 +608,52 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills
Util.SetGray(this.skillList[i].go,false)
end
- Util.AddOnceClick(this.skillList[i].icon.gameObject, function()
+ Util.AddOnceClick(this.skillBtnsList[i].gameObject, function()
this.SetSelectSkillImage(this.skillList[i].icon.gameObject)
+ if this.skillPanel then
+ UIManager.ClosePanel(this.skillPanelId)
+ end
if this.skillData[i].Type < 5 then
local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,this.skillData[i].Type)
if this.skillData[i].Type == 4 and this.skillData[i].state == 0 then
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),"\n(法宝25级解锁)")
+ this.skillPanelId = UIName.SkillInfoPopup
else
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId))
- end
- this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1
+ this.skillPanelId = UIName.SkillInfoPopup
+ end
else
- if this.skillPanel then
- UIManager.ClosePanel(UIName.SkillInfoPopup)
- end
if this.skillData[i].Type > 4 and this.skillData[i].Type < 9 then
- UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
+ this.skillPanel = UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
+ this.skillPanelId = UIName.RoleTalentPopup
elseif this.skillData[i].Type == 9 then
if this.skillData[i].state == 0 then
- UIManager.OpenPanel(UIName.RoleGodSoulLayout,curHeroData.heroConfig,11)
+ this.skillPanel = UIManager.OpenPanel(UIName.RoleGodSoulLayout,curHeroData.heroConfig,11)
+ this.skillPanelId = UIName.RoleGodSoulLayout
else
- UIManager.OpenPanel(UIName.RoleGodSoulLayout,curHeroData)
+ this.skillPanel = UIManager.OpenPanel(UIName.RoleGodSoulLayout,curHeroData)
+ this.skillPanelId = UIName.RoleGodSoulLayout
end
end
- end
+ end
+ this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1
end)
end
end
if #this.skillData > 2 then
this.line1.gameObject:SetActive(true)
+ this.line3.gameObject:SetActive(true)
+
else
this.line1.gameObject:SetActive(false)
+ this.line3.gameObject:SetActive(false)
end
if #this.skillData > 4 then
this.line2.gameObject:SetActive(true)
+ this.line4.gameObject:SetActive(true)
else
this.line2.gameObject:SetActive(false)
+ this.line4.gameObject:SetActive(false)
end
end
@@ -727,36 +743,22 @@ end
--更新英雄升级 和 突破数据
function this:UpdateHeroUpLvAndBreakData()
-- 升级获取突破 和 升星相应heroRankUpConfig静态数据
- LogError("isHeroUpStar "..tostring(isHeroUpStar))
- if isHeroUpStar and upStarRankUpConfig and curTuPoRankUpConfig and curTuPoRankUpConfig.JudgeClass==1 and curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then--当前突破全部完成
- this.tipUpLv.text=Language[11804]
- this.tipUpLv.gameObject:SetActive(true)
- this.itemGrid.gameObject:SetActive(false)
- this.upLvBtnText.text=Language[11805]
- --this.upLvBtnImage.sprite = this.spLoader:LoadSprite("r_hero_button_001")--r_chouka_button_004
- _isClicked = false
- _isReqLvUp = false
- else
+ --LogError("isHeroUpStar "..tostring(isHeroUpStar))
+ if isHeroUpTuPo and upTuPoRankUpConfig and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then--当前突破全部完成
this.itemGrid.gameObject:SetActive(true)
this.tipUpLv.gameObject:SetActive(false)
- LogError("isHeroUpTuPo "..tostring(isHeroUpTuPo))
- if isHeroUpTuPo and upTuPoRankUpConfig and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
- this.upLvBtnText.text=Language[11805]
- --this.upLvBtnImage.sprite = this.spLoader:LoadSprite("r_hero_button_001")--r_chouka_button_004
+ this.upLvBtnText.text=Language[11805]
+ this.tipUpLv.text=Language[11804]
+ this.tipUpLv.gameObject:SetActive(false)
+ else
+ this.upLvBtnText.text=Language[11063]
+ if isHeroUpStar and curStarRankUpConfig and curHeroData.lv >= curStarRankUpConfig.OpenLevel then--当前突破全部完成
+ this.tipUpLv.text=Language[11804]
+ this.tipUpLv.gameObject:SetActive(true)
+ this.itemGrid.gameObject:SetActive(false)
else
- this.upLvBtnText.text=Language[11063]
- --this.upLvBtnImage.sprite = this.spLoader:LoadSprite("r_hero_button_002")
- end
- if isHeroUpStar and upStarRankUpConfig and curTuPoRankUpConfig and curTuPoRankUpConfig.JudgeClass==1 and curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then--当前突破全部完成
- if curStarRankUpConfig then--进阶过处理
- if curHeroData.lv == curStarRankUpConfig.OpenLevel then
- this.tipUpLv.text=Language[11804]
- this.tipUpLv.gameObject:SetActive(false)
- end
- else--从未进阶过处理
- this.tipUpLv.text=Language[11804]
- this.tipUpLv.gameObject:SetActive(false)
- end
+ this.itemGrid.gameObject:SetActive(true)
+ this.tipUpLv.gameObject:SetActive(false)
end
end
this:UpdateHeroUpLvAndBreakMaterialShow()
@@ -776,6 +778,7 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
timer = 0
return
end
+
--可以升星 是当前星级突破已满,等级也到了突破最大等级
if isHeroUpStar and upStarRankUpConfig and curTuPoRankUpConfig and curTuPoRankUpConfig.JudgeClass==1 and curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then--当前突破全部完成
if curStarRankUpConfig then--进阶过处理
@@ -811,14 +814,26 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
end,Language[10731],showBtnTipStr)
end
else
- if isUpLvMaterials then
- this:DeleteLvUpMaterials()
- else
- _isClicked = false
- if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
- PopupTipPanel.ShowTip(Language[11813])
+ if isHeroUpTuPo and oldLv == upTuPoRankUpConfig.LimitLevel then --点击按钮之前的等级 == 突破最大等级 说明是突破
+ if isUpLvMaterials then
+ this:DeleteLvUpMaterials()
else
- PopupTipPanel.ShowTip(Language[11814])
+ PopupTipPanel.ShowTip(Language[11813])
+ end
+ _isClicked = false
+ _isLongPress = false
+ this.isPressed = false
+ timer = 0
+ elseif not isHeroUpTuPo or curHeroData.lv < upTuPoRankUpConfig.LimitLevel then
+ if isUpLvMaterials then
+ this:DeleteLvUpMaterials()
+ else
+ _isClicked = false
+ if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
+ PopupTipPanel.ShowTip(Language[11813])
+ else
+ PopupTipPanel.ShowTip(Language[11814])
+ end
end
end
end
@@ -830,10 +845,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
end,Language[10731],Language[11809])
end
elseif isHeroUpTuPo and oldLv == upTuPoRankUpConfig.LimitLevel then --点击按钮之前的等级 == 突破最大等级 说明是突破
- _isClicked = false
- _isLongPress = false
- this.isPressed = false
- timer = 0
if isUpLvMaterials then
this:DeleteLvUpMaterials()
else