diff --git a/Assets/ManagedResources/Icon/FaBao/r_fb_kulou.png.meta b/Assets/ManagedResources/Icon/FaBao/r_fb_kulou.png.meta
new file mode 100644
index 0000000000..280c33d022
--- /dev/null
+++ b/Assets/ManagedResources/Icon/FaBao/r_fb_kulou.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: d1208664c768d6c41881ff114ea1b3d0
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 8c832decfcd5cf64385e1f8e6140d7b8
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icon/Hero/c_mp_00051_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_mp_00051_t1.png.meta
new file mode 100644
index 0000000000..aa7768f46a
--- /dev/null
+++ b/Assets/ManagedResources/Icon/Hero/c_mp_00051_t1.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 997297c6458b6f34f98966e784a84286
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: c4d9c258d2112dc4fa4c95d5053af132
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icon/Hero/c_mp_00051_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_mp_00051_t3.png.meta
new file mode 100644
index 0000000000..3c1d47bf09
--- /dev/null
+++ b/Assets/ManagedResources/Icon/Hero/c_mp_00051_t3.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: cfa94d9ffc587ed479e2b523961614e1
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 7ea617f29479a18499fa0e24a37aca8b
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icon/Hero/c_yxz_0057_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_yxz_0057_t1.png.meta
new file mode 100644
index 0000000000..aba8496df0
--- /dev/null
+++ b/Assets/ManagedResources/Icon/Hero/c_yxz_0057_t1.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 036aaeb032028c04d99518637e043a61
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: e6aa970a19b92414393f96e0243c4c0d
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icon/Hero/c_yxz_0057_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_yxz_0057_t3.png.meta
new file mode 100644
index 0000000000..6ca8db5c02
--- /dev/null
+++ b/Assets/ManagedResources/Icon/Hero/c_yxz_0057_t3.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 8db54a82fe82d7d4581150b78816b193
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: b2a83e5546b0451429914cc24cd8dc6c
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icons/SkillIcon/i_s_1930_dz.png.meta b/Assets/ManagedResources/Icons/SkillIcon/i_s_1930_dz.png.meta
new file mode 100644
index 0000000000..7909e593ff
--- /dev/null
+++ b/Assets/ManagedResources/Icons/SkillIcon/i_s_1930_dz.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 22a7f861415049047bbf87e0a0854b60
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 9328623ffd1001e46a985483e7ddebb6
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Icons/SkillIcon/i_s_1940_dz.png.meta b/Assets/ManagedResources/Icons/SkillIcon/i_s_1940_dz.png.meta
new file mode 100644
index 0000000000..040b7cda39
--- /dev/null
+++ b/Assets/ManagedResources/Icons/SkillIcon/i_s_1940_dz.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 6113fac4d1100544b9a18fedc9b3e3fc
+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: -1
+ 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: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 7498c8f02f2feab4581f3c8c01f8002f
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
index dae694c909..43562cd89f 100644
--- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
@@ -109,7 +109,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6857808212502247567
@@ -243,80 +243,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &47104966174392622
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8434273939499730211}
- - component: {fileID: 3199751131082787360}
- - component: {fileID: 8124016895609013051}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8434273939499730211
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 47104966174392622}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 5706647183050471241}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3199751131082787360
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 47104966174392622}
- m_CullTransparentMesh: 0
---- !u!114 &8124016895609013051
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 47104966174392622}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &61343568060374799
GameObject:
m_ObjectHideFlags: 0
@@ -448,7 +374,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1945266102708876749
@@ -543,7 +469,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3577574073589810221
@@ -711,7 +637,7 @@ RectTransform:
- {fileID: 1587254140519126910}
- {fileID: 908526607333890391}
- {fileID: 5465283425492029654}
- - {fileID: 5824746651593307809}
+ - {fileID: 9136682905079389572}
- {fileID: 2246949390990155489}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 1
@@ -800,80 +726,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
---- !u!1 &293165490857715808
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5824746651593307809}
- - component: {fileID: 758580212790301879}
- - component: {fileID: 5217541420099395989}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5824746651593307809
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 293165490857715808}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 8862109774811217555}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &758580212790301879
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 293165490857715808}
- m_CullTransparentMesh: 0
---- !u!114 &5217541420099395989
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 293165490857715808}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &399262215203039042
GameObject:
m_ObjectHideFlags: 0
@@ -1217,7 +1069,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1385456356405182457
@@ -1530,7 +1382,7 @@ RectTransform:
- {fileID: 1926534457976954735}
- {fileID: 1962780413574007779}
- {fileID: 4518601355157253935}
- - {fileID: 2360636630990117172}
+ - {fileID: 6637916390862436588}
- {fileID: 6484163518754581886}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 2
@@ -2012,80 +1864,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1154557535797429828
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8253604539304366061}
- - component: {fileID: 7425803967665077534}
- - component: {fileID: 6304350038371637072}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8253604539304366061
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1154557535797429828}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1446396936943585240}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7425803967665077534
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1154557535797429828}
- m_CullTransparentMesh: 0
---- !u!114 &6304350038371637072
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1154557535797429828}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &1182594103365515116
GameObject:
m_ObjectHideFlags: 0
@@ -2324,80 +2102,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1287936732020415203
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2360636630990117172}
- - component: {fileID: 6169622610755545409}
- - component: {fileID: 2697189367988360080}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2360636630990117172
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1287936732020415203}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 8731172215465775027}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6169622610755545409
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1287936732020415203}
- m_CullTransparentMesh: 0
---- !u!114 &2697189367988360080
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1287936732020415203}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &1310063320499570558
GameObject:
m_ObjectHideFlags: 0
@@ -3158,7 +2862,7 @@ RectTransform:
- {fileID: 5277842933424643249}
- {fileID: 7391240418342012949}
- {fileID: 5131664179804945769}
- - {fileID: 8082185107484054983}
+ - {fileID: 8394402084386626291}
- {fileID: 2986285218791290361}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 7
@@ -3430,7 +3134,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2913544029638185858
@@ -3718,80 +3422,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text:
LanguageIndex: 0
---- !u!1 &2582393293142787752
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8082185107484054983}
- - component: {fileID: 2577040798047448037}
- - component: {fileID: 459052653928704213}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8082185107484054983
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2582393293142787752}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 3793364676688232364}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2577040798047448037
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2582393293142787752}
- m_CullTransparentMesh: 0
---- !u!114 &459052653928704213
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2582393293142787752}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &2626366168598173844
GameObject:
m_ObjectHideFlags: 0
@@ -4290,80 +3920,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &2997866462225151060
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1047750030717286147}
- - component: {fileID: 8598733042658542222}
- - component: {fileID: 3647149189568551266}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1047750030717286147
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2997866462225151060}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4324901097677990687}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8598733042658542222
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2997866462225151060}
- m_CullTransparentMesh: 0
---- !u!114 &3647149189568551266
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2997866462225151060}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &3098046800893694607
GameObject:
m_ObjectHideFlags: 0
@@ -5049,7 +4605,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2715742439024597215
@@ -6072,7 +5628,7 @@ RectTransform:
- {fileID: 2416025388075475902}
- {fileID: 7697481585945734568}
- {fileID: 1802317808611385104}
- - {fileID: 8253604539304366061}
+ - {fileID: 7800197980308298130}
- {fileID: 2746986559745554097}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 3
@@ -6606,6 +6162,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4343142567404734894
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6928896997012348270}
+ - component: {fileID: 3705913313240397756}
+ - component: {fileID: 3424492317748535149}
+ - component: {fileID: 4917290024320654933}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6928896997012348270
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4343142567404734894}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5706647183050471241}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3705913313240397756
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4343142567404734894}
+ m_CullTransparentMesh: 0
+--- !u!114 &3424492317748535149
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4343142567404734894}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &4917290024320654933
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4343142567404734894}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &4382953218618407814
GameObject:
m_ObjectHideFlags: 0
@@ -6716,7 +6367,7 @@ RectTransform:
- {fileID: 6899063292722404381}
- {fileID: 3692112773888588422}
- {fileID: 2983673523900596962}
- - {fileID: 1047750030717286147}
+ - {fileID: 3598416116038375758}
- {fileID: 1642426198475887153}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 6
@@ -7050,6 +6701,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4690268635105291861
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3598416116038375758}
+ - component: {fileID: 1593876251139156817}
+ - component: {fileID: 5041624284552846090}
+ - component: {fileID: 6416904811543988926}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3598416116038375758
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4690268635105291861}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4324901097677990687}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1593876251139156817
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4690268635105291861}
+ m_CullTransparentMesh: 0
+--- !u!114 &5041624284552846090
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4690268635105291861}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &6416904811543988926
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4690268635105291861}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &4744300754023568756
GameObject:
m_ObjectHideFlags: 0
@@ -7280,6 +7026,196 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4919350249588010449
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6637916390862436588}
+ - component: {fileID: 2515217758891571729}
+ - component: {fileID: 1379306971978386610}
+ - component: {fileID: 634991077605748479}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6637916390862436588
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4919350249588010449}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 8731172215465775027}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2515217758891571729
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4919350249588010449}
+ m_CullTransparentMesh: 0
+--- !u!114 &1379306971978386610
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4919350249588010449}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &634991077605748479
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4919350249588010449}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
+--- !u!1 &4952056812333654496
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9136682905079389572}
+ - component: {fileID: 3169160273040430724}
+ - component: {fileID: 2931198365777778126}
+ - component: {fileID: 6708136619088971111}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9136682905079389572
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4952056812333654496}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 8862109774811217555}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3169160273040430724
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4952056812333654496}
+ m_CullTransparentMesh: 0
+--- !u!114 &2931198365777778126
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4952056812333654496}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &6708136619088971111
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4952056812333654496}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &4977043780016936042
GameObject:
m_ObjectHideFlags: 0
@@ -7315,7 +7251,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4826604875598597886
@@ -7486,7 +7422,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3755072065836791195
@@ -7630,7 +7566,8 @@ GameObject:
m_Component:
- component: {fileID: 3788769547993284713}
- component: {fileID: 5646250700578190587}
- - component: {fileID: 1138229287769382160}
+ - component: {fileID: 8566183421787626312}
+ - component: {fileID: 4756092835417996114}
m_Layer: 0
m_Name: Name
m_TagString: Untagged
@@ -7654,7 +7591,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -3, y: 2.7}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 108, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5646250700578190587
@@ -7665,7 +7602,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5305390442090340424}
m_CullTransparentMesh: 0
---- !u!114 &1138229287769382160
+--- !u!114 &8566183421787626312
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -7674,26 +7611,46 @@ MonoBehaviour:
m_GameObject: {fileID: 5305390442090340424}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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: 84339bb0a60d75c4ab0fd48b2d1560d1, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &4756092835417996114
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5305390442090340424}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &5316168732639601387
GameObject:
m_ObjectHideFlags: 0
@@ -7803,7 +7760,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7468168532232674448
@@ -7972,7 +7929,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &189811043100551250
@@ -8201,80 +8158,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &5738890040750841067
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 16221843802633763}
- - component: {fileID: 4551901763416151491}
- - component: {fileID: 2422159385962074910}
- m_Layer: 0
- m_Name: Name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &16221843802633763
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5738890040750841067}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 2892213053006570085}
- 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: -3, y: 2.7}
- m_SizeDelta: {x: 108, y: 110}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4551901763416151491
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5738890040750841067}
- m_CullTransparentMesh: 0
---- !u!114 &2422159385962074910
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5738890040750841067}
- 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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 &5775429739536354028
GameObject:
m_ObjectHideFlags: 0
@@ -8618,7 +8501,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2790470037022186253
@@ -9092,7 +8975,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6970788777158312021
@@ -9864,7 +9747,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5597693079201974275
@@ -9924,6 +9807,101 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1.5, y: -1.5}
m_UseGraphicAlpha: 1
+--- !u!1 &7020438654267904769
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7800197980308298130}
+ - component: {fileID: 7800496120483163190}
+ - component: {fileID: 2300997538918670644}
+ - component: {fileID: 7137996589672728031}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7800197980308298130
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7020438654267904769}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1446396936943585240}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7800496120483163190
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7020438654267904769}
+ m_CullTransparentMesh: 0
+--- !u!114 &2300997538918670644
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7020438654267904769}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &7137996589672728031
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7020438654267904769}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &7026667848329288324
GameObject:
m_ObjectHideFlags: 0
@@ -10986,7 +10964,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1407333830392709756
@@ -11399,7 +11377,7 @@ RectTransform:
- {fileID: 2548280605015794995}
- {fileID: 7184132266332862634}
- {fileID: 4587842614469524677}
- - {fileID: 8434273939499730211}
+ - {fileID: 6928896997012348270}
- {fileID: 2934517035916273019}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 4
@@ -11910,6 +11888,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8578955922328948245
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8394402084386626291}
+ - component: {fileID: 7364359047288916348}
+ - component: {fileID: 1705488695588434602}
+ - component: {fileID: 4727802700936002087}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8394402084386626291
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8578955922328948245}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3793364676688232364}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7364359047288916348
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8578955922328948245}
+ m_CullTransparentMesh: 0
+--- !u!114 &1705488695588434602
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8578955922328948245}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &4727802700936002087
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8578955922328948245}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &8607135437872593044
GameObject:
m_ObjectHideFlags: 0
@@ -12018,7 +12091,7 @@ RectTransform:
- {fileID: 7922571151628173192}
- {fileID: 8853032334467751070}
- {fileID: 7970898282907675827}
- - {fileID: 16221843802633763}
+ - {fileID: 8192342422285460114}
- {fileID: 2717582035598229703}
m_Father: {fileID: 3070440297335827591}
m_RootOrder: 5
@@ -12511,6 +12584,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8917397333368148546
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8192342422285460114}
+ - component: {fileID: 5341757416224840085}
+ - component: {fileID: 1138058764790277555}
+ - component: {fileID: 9214021296438449810}
+ m_Layer: 0
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8192342422285460114
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8917397333368148546}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -100}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2892213053006570085}
+ 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: 0}
+ m_SizeDelta: {x: 108, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5341757416224840085
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8917397333368148546}
+ m_CullTransparentMesh: 0
+--- !u!114 &1138058764790277555
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8917397333368148546}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u653B\u51FB"
+--- !u!114 &9214021296438449810
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8917397333368148546}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &9030675173329363319
GameObject:
m_ObjectHideFlags: 0
@@ -12630,7 +12798,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8433459006131599699
@@ -12725,7 +12893,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 1.7, y: 3.4}
+ m_AnchoredPosition: {x: 1.7, y: 3.3999996}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4734599729844987954
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
index 233afcd734..98142b2653 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
@@ -55,7 +55,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &4633213687808411125
RectTransform:
m_ObjectHideFlags: 0
@@ -72,10 +72,10 @@ RectTransform:
m_Father: {fileID: 1828482313430278523}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 300, y: -117}
- m_SizeDelta: {x: 600, y: 234}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 385, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5084091286484917787
CanvasRenderer:
@@ -784,10 +784,10 @@ RectTransform:
m_Father: {fileID: 4633213687808411125}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 300, y: -117}
- m_SizeDelta: {x: 600, y: 174}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 385, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1017512787234966051
MonoBehaviour:
@@ -5372,10 +5372,10 @@ RectTransform:
m_Father: {fileID: 6475116166128363344}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 300, y: -37}
- m_SizeDelta: {x: 382, y: 74}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2325707849154950736
CanvasRenderer:
@@ -6332,7 +6332,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: 509, y: -0}
+ m_AnchoredPosition: {x: 509, y: 0}
m_SizeDelta: {x: 1018, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1973149274280526846
@@ -7101,7 +7101,7 @@ GameObject:
m_Component:
- component: {fileID: 4209546028681882202}
- component: {fileID: 6360147296956617736}
- - component: {fileID: 159784019866316574}
+ - component: {fileID: 1748259032992781433}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
@@ -7123,10 +7123,10 @@ RectTransform:
m_Father: {fileID: 6475116166128363344}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 300, y: -124}
- m_SizeDelta: {x: 600, y: 100}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 385, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6360147296956617736
MonoBehaviour:
@@ -7141,18 +7141,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 40
- m_Right: 0
+ m_Left: 70
+ m_Right: 70
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 250, y: 50}
- m_Spacing: {x: 50, y: 0}
+ m_Spacing: {x: 130, y: 0}
m_Constraint: 1
m_ConstraintCount: 2
---- !u!114 &159784019866316574
+--- !u!114 &1748259032992781433
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -7161,17 +7161,11 @@ MonoBehaviour:
m_GameObject: {fileID: 4902360537253194920}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_IgnoreLayout: 0
- m_MinWidth: 600
- m_MinHeight: 100
- m_PreferredWidth: -1
- m_PreferredHeight: -1
- m_FlexibleWidth: -1
- m_FlexibleHeight: -1
- m_LayoutPriority: 1
+ m_HorizontalFit: 2
+ m_VerticalFit: 2
--- !u!1 &5102170010853879747
GameObject:
m_ObjectHideFlags: 0
@@ -11230,7 +11224,7 @@ MonoBehaviour:
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
+ m_ChildControlWidth: 1
m_ChildControlHeight: 1
--- !u!114 &1539574512763238056
MonoBehaviour:
@@ -12232,7 +12226,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
- m_Alignment: 3
+ m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@@ -12253,7 +12247,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
- m_VerticalFit: 2
+ m_VerticalFit: 0
--- !u!1 &8772879527031137081
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab
index ed85a74864..b0b518aeb2 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab
@@ -344,10 +344,10 @@ RectTransform:
m_Father: {fileID: 8569408221378906818}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 298, y: -25}
+ m_SizeDelta: {x: 250, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7321926799232025417
CanvasRenderer:
@@ -384,7 +384,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
- m_Alignment: 5
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@@ -1754,7 +1754,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -20, y: 30}
- m_SizeDelta: {x: 0, y: 50}
+ m_SizeDelta: {x: 194, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &573654475003589758
CanvasRenderer:
@@ -1825,7 +1825,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2536559242930971238}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -4902,7 +4902,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &338931501448661155
RectTransform:
m_ObjectHideFlags: 0
@@ -4918,10 +4918,10 @@ RectTransform:
m_Father: {fileID: 8420829159650770875}
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: 462.9, y: 0}
- m_SizeDelta: {x: 725.8, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 462.9, y: -79}
+ m_SizeDelta: {x: 725.8, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5631977101328081240
CanvasRenderer:
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab
index 9853a7d4cb..641307e2e9 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab
@@ -5164,7 +5164,7 @@ ParticleSystem:
--- !u!199 &8313613043764456483
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -10021,7 +10021,7 @@ ParticleSystem:
--- !u!199 &1883451300196430540
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -15240,7 +15240,7 @@ ParticleSystem:
--- !u!199 &8869839627572188808
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -20128,7 +20128,7 @@ ParticleSystem:
--- !u!199 &8208152097055079434
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -25632,7 +25632,7 @@ ParticleSystem:
--- !u!199 &2540501935944717990
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -30410,7 +30410,7 @@ ParticleSystem:
--- !u!199 &9117784442965181129
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -36383,7 +36383,7 @@ ParticleSystem:
--- !u!199 &7003960742294185177
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -41545,7 +41545,7 @@ ParticleSystem:
--- !u!199 &1979368530785841942
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -46844,7 +46844,7 @@ ParticleSystem:
--- !u!199 &5420548173896330049
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -53050,7 +53050,7 @@ ParticleSystem:
--- !u!199 &5735290854897617906
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -57980,7 +57980,7 @@ ParticleSystem:
--- !u!199 &4631660157126799171
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -62942,7 +62942,7 @@ ParticleSystem:
--- !u!199 &4623779345726920190
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -63640,6 +63640,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4447806823229150205
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1060651427909205582}
+ - component: {fileID: 6054586341083494772}
+ - component: {fileID: 1533330574047189856}
+ m_Layer: 5
+ m_Name: tip
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1060651427909205582
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4447806823229150205}
+ 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: 5594356597870185692}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 485, y: -2.8975}
+ m_SizeDelta: {x: 562.1, y: 67.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6054586341083494772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4447806823229150205}
+ m_CullTransparentMesh: 0
+--- !u!114 &1533330574047189856
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4447806823229150205}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0, b: 0, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 34
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 42
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text:
+ LanguageIndex: 11559
--- !u!1 &4534405370102703475
GameObject:
m_ObjectHideFlags: 0
@@ -68284,7 +68364,7 @@ ParticleSystem:
--- !u!199 &5265517486879176092
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -73061,7 +73141,7 @@ ParticleSystem:
--- !u!199 &5400512518044566367
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -78366,7 +78446,7 @@ ParticleSystem:
--- !u!199 &7442565295265048835
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -80153,6 +80233,7 @@ RectTransform:
- {fileID: 1381114801743157822}
- {fileID: 8599379674280193571}
- {fileID: 8464684481828862374}
+ - {fileID: 1060651427909205582}
m_Father: {fileID: 5594375324361613308}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -85704,7 +85785,7 @@ ParticleSystem:
--- !u!199 &3949675870474462023
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -90897,7 +90978,7 @@ ParticleSystem:
--- !u!199 &7021895492894144576
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -96128,7 +96209,7 @@ ParticleSystem:
--- !u!199 &1692289323063453355
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -101348,7 +101429,7 @@ ParticleSystem:
--- !u!199 &6068072179785192791
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -106807,7 +106888,7 @@ ParticleSystem:
--- !u!199 &3520821794126687970
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -112101,7 +112182,7 @@ ParticleSystem:
--- !u!199 &1271161880039071811
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -117580,7 +117661,7 @@ ParticleSystem:
--- !u!199 &3875074028085076739
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -123633,7 +123714,7 @@ ParticleSystem:
--- !u!199 &5966421009235644946
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -128447,7 +128528,7 @@ ParticleSystem:
--- !u!199 &2504059542704858771
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
index 33de8c3ac4..e578c4b153 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
@@ -9698,19 +9698,20 @@ local passivityList = {
if skill and not skill.isTriggerJudge and judge==1 then
return
end
+ local aa=dt
if skill and skill.type == BattleSkillType.Normal and skill.isAdd and skill.owner==role then
--如果是boss 并且额外伤害是根据最大生命则返回
if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then
return
end
- if (f1==12 or f1==13) and p1 then
+ if (f1==12 or f1==13) and p1 then
if haveRage>defRole.Rage then
- dt=dt+p1
+ aa=aa+p1
else
defRole:AddBuff(Buff.Create(role, BuffName.BanBlood, p2))
end
end
- local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1])))
+ local val = -floor(BattleUtil.FP_Mul(aa, defRole:GetRoleData(BattlePropList[f1])))
if f1==12 or f1==13 then
BattleUtil.FinalDamageCountShield(nil,role,defRole,-val)
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua
index 88c65f8b9d..9015bb6849 100644
--- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua
@@ -4,7 +4,7 @@ local gemConfig = ConfigManager.GetConfig(ConfigName.GemConfig)
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local typeName = {
- [1] = "攻击",[2] = "生命",[3] = "增伤",[4] = "减伤",[5] = "人杰",[6] = "佛禅",[7] = "妖灵",[8] = "道玄",
+ [1] = "攻击",[2] = "生命",[3] = "护甲",[4] = "魔抗",[5] = "攻击",[6] = "生命",[7] = "护甲",[8] = "魔抗",
}
local imgName = {
[1] = "m_mingge_gongji",[2] = "m_mingge_shengming",[3] = "m_mingge_zengshang",[4] = "m_mingge_shanghai",
@@ -119,10 +119,10 @@ function Gem:SetGems()
local gemData = GemManager.myGemList
for i = 1, 8 do
local itemGo = Util.GetGameObject(self.gems,"item ("..i..")")
- local nameImg = Util.GetGameObject(itemGo,"Name"):GetComponent("Image")
+ local nameImg = Util.GetGameObject(itemGo,"Name"):GetComponent("Text")
local redPoint = Util.GetGameObject(itemGo,"RedPoint")
self.lightList[i] = Util.GetGameObject(itemGo,"Light")
- nameImg.sprite = self.spLoader:LoadSprite(imgName[i])
+ nameImg.text = typeName[i]
redPoint:SetActive(false)
for j = 1, 3 do
local stoneGo = Util.GetGameObject(itemGo,"stone ("..j..")")
@@ -257,7 +257,13 @@ function Gem:SetProperty(configData,data,parent,text)
self.propertyList[parent][j] = item
end
item:SetActive(true)
- item:GetComponent("Text").text = string.format( "%s+%s",PropertyConfig[data[1]].Info,data[2]/100).."%"
+ local str=""
+ if PropertyConfig[data[1]].Style==1 then
+ str=string.format( "全体神将%s+%s",PropertyConfig[data[1]].Info,data[2])
+ elseif PropertyConfig[data[1]].Style==2 then
+ str=string.format( "全体神将%s+%s",PropertyConfig[data[1]].Info,data[2]/100).."%"
+ end
+ item:GetComponent("Text").text = str -- string.format( "%s+%s",PropertyConfig[data[1]].Info,data[2]/100).."%"
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua
index 9753d8d253..07296c9238 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua
@@ -81,7 +81,13 @@ function SelectGem:SingleDataShow(go,data,index)
local property = gemConfig[data.id].Property
local textDesc = ""
for i = 1, #property do
- textDesc = textDesc..string.format( "全体神将%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%"
+ local str=""
+ if PropertyConfig[property[i][1]].Style==1 then
+ str=string.format( "全体神将%s+%s",PropertyConfig[property[i][1]].Info,property[i][2])
+ elseif PropertyConfig[property[i][1]].Style==2 then
+ str=string.format( "全体神将%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%"
+ end
+ textDesc = str--textDesc..string.format( "全体神将%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%"
if property[i+1] then
textDesc = textDesc.."\n"
end
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Gem.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Gem.lua
index 9ed933f87e..756c19610e 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Gem.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Gem.lua
@@ -45,7 +45,13 @@ function this:Refresh()
self.itemList[value.id] = go
end
go:SetActive(true)
- go:GetComponent("Text").text = string.format("%s+%s",propertyConfig[value.id].Info,value.num/100).."%"
+ local str=""
+ if propertyConfig[value.id].Style==1 then
+ str=string.format( "全体神将%s+%s",propertyConfig[value.id].Info,value.num)
+ elseif propertyConfig[value.id].Style==2 then
+ str=string.format( "全体神将%s+%s",propertyConfig[value.id].Info,value.num/100).."%"
+ end
+ go:GetComponent("Text").text = str--string.format("%s+%s",propertyConfig[value.id].Info,value.num/100).."%"
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua
index a96ec1291c..a4710670c7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua
@@ -422,7 +422,7 @@ function this._TimeUpdate()
--LogError("timeStamp=="..limitTime-GetTimeStamp())
local cha =limitTime-GetTimeStamp()
if cha>86400 then
- this.timeText.text = string.format("%s后开启",TimeToD(limitTime-GetTimeStamp()))
+ this.timeText.text = string.format("%s天后开启",TimeToD(limitTime-GetTimeStamp()))
elseif cha>3600 then
this.timeText.text = string.format("%s后开启",TimeToH(limitTime-GetTimeStamp()))
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index 13c3afb71d..eecbd1e609 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -3325,6 +3325,20 @@ function this.IsShowFlyUpRedPoint(curHeroData,isNoDeleFormation)--isNoDeleFormat
-- --培养已满
-- end
local curUpStarData= HeroManager.GetHeroCurUpStarInfo(curHeroData.dynamicId)
+
+ local upStarRankUpConfig = nil
+ local heroRankUpConfig = ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
+ for i, v in ConfigPairs(heroRankUpConfig) do
+ if v.Star==curHeroData.heroConfig.Star then--初始星级相等
+ if v.Show==2 then -- 2 升星
+ if v.Id ~= curHeroData.upStarId and curHeroData.star == v.LimitStar then
+ --Log("升星 "..v.Id)
+ upStarRankUpConfig=v
+ end
+ end
+ end
+ end
+
if curUpStarData and #curUpStarData>0 then
else
--培养已满
@@ -3339,6 +3353,9 @@ function this.IsShowFlyUpRedPoint(curHeroData,isNoDeleFormation)--isNoDeleFormat
--不能升星
return false
end
+ if upStarRankUpConfig and upStarRankUpConfig.LimitHongmengLevel and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) < upStarRankUpConfig.LimitHongmengLevel then
+ return false
+ end
if upStarRankUpConfig then
local ConsumeMaterial = upStarRankUpConfig.ConsumeMaterial
for i = 1, #ConsumeMaterial do
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 33b212d922..0a9ed7e0ab 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -1774,7 +1774,7 @@ function this.RequestUserForceChange(teamId, func)
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_FORCE_CHANGE_REQUEST, MessageTypeProto_pb.USER_FORCE_CHANGE_RESPONSE, msg, function()
CheckRedPointStatus(RedPointType.Practice_Cultivation)
- CheckRedPointStatus(RedPointType.PowerRiceGool)
+ CommonActPageManager.GetPowerRicePower()
if func then
func()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
index 94e3dc3f5f..4ce9fe7e0f 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
@@ -919,6 +919,7 @@ function this.GetPowerRicePower(func)
RankingManager.InitData(RANK_TYPE.POWER_RICE,function ()
local allRankData,myRankData = RankingManager.GetRankingInfo()
this.powerRicePower = myRankData.param1
+ CheckRedPointStatus(RedPointType.PowerRiceGool)
end,0)
end
if func then
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
index 95de5fe9b1..5d1fe243a6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
@@ -279,16 +279,18 @@ function RewardEquipSingleShowPopup2:OnShow()
for _, pro in ipairs(_BaseProList) do
pro:SetActive(false)
end
+ local num = 0
for index, prop in ipairs(equipConfigData.Property) do
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
+ num = num + 1
--基础属性
- if not _BaseProList[index] then
- _BaseProList[index] = newObjToParent(self.baseProPre, self.baseProGrid)
+ if not _BaseProList[num] then
+ _BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
end
- _BaseProList[index]:SetActive(true)
- _BaseProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
- local vText = Util.GetGameObject(_BaseProList[index], "curProVale"):GetComponent("Text")
+ _BaseProList[num]:SetActive(true)
+ _BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
+ local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
@@ -297,6 +299,26 @@ function RewardEquipSingleShowPopup2:OnShow()
end
end
end
+ if equipConfigData.Quality == 6 then
+ local prop = equipConfigData.PropertyMin
+ local proConfigData = ConfigManager.TryGetConfigData(ConfigName.PropertyConfig, prop[1])
+ if proConfigData then
+ num = num + 1
+ --基础属性
+ if not _BaseProList[num] then
+ _BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
+ end
+ _BaseProList[num]:SetActive(true)
+ _BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
+ local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
+ -- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
+ if prop[2] > 0 then
+ vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2]).."(提升至白金装备解锁)"
+ else
+ vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2]).."(提升至白金装备解锁)不朽天赋:(提升至白金装备解锁)"
+ value.text = ""
+ _superProList[num]:GetComponent("Text").enabled = false
+ end
if curGoldSuitConFig and curGoldSuitConFig.SuiteSkill then
self.superPro:SetActive(true)
if curGoldSuitConFig then
local goldSuiteSkill = curGoldSuitConFig.SuiteSkill
- for i = 1, math.max(#goldSuiteSkill, #_superProList) do
- if not _superProList[i] then
- _superProList[i] = newObjToParent(self.superProPre, self.superProGrid)
- end
- _superProList[i].gameObject:SetActive(true)
- end
for i = 1, #goldSuiteSkill do
- local go = _superProList[i]
+ num = num + 1
+ if not _superProList[num] then
+ _superProList[num] = newObjToParent(self.superProPre, self.superProGrid)
+ end
+ _superProList[num].gameObject:SetActive(true)
+ local go = _superProList[num]
go.gameObject:SetActive(true)
local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text")
local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text")
@@ -392,6 +430,7 @@ function RewardEquipSingleShowPopup2:OnShow()
value.text = string.format("(%s)",GetEquipSuitStr(curGoldSuitConFig.Id,goldSuiteSkill[i][1]))
go:GetComponent("Text").text = string.format("%s",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
end
+ go:GetComponent("Text").enabled = true
end
end
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua
index db1b12878e..b485bacc03 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua
@@ -244,7 +244,13 @@ function this.SetGemProperty()
this.proList[i] = go
end
go:SetActive(true)
- go:GetComponent("Text").text = string.format( "全体神将%s+%s",PropertyConfig[data[i][1]].Info,data[i][2]/100).."%"
+ local str=""
+ if PropertyConfig[data[i][1]].Style==1 then
+ str=string.format( "全体神将%s+%s",PropertyConfig[data[i][1]].Info,data[i][2])
+ elseif PropertyConfig[data[i][1]].Style==2 then
+ str=string.format( "全体神将%s+%s",PropertyConfig[data[i][1]].Info,data[i][2]/100).."%"
+ end
+ go:GetComponent("Text").text = str
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua b/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua
index 8477e00dea..3210fea192 100644
--- a/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/PowerRice/PowerRicePanel.lua
@@ -141,7 +141,6 @@ function PowerRice:Refresh(_curIndex,isTop,isAni)
end
PowerRice:SetTime()
PowerRice:SetLive2D()
- CheckRedPointStatus(RedPointType.PowerRiceGool)
end,0)
end
@@ -198,6 +197,7 @@ function PowerRice:SingleDataShow(item,data,index)
JumpManager.GoJump(22001)
elseif state == 1 then
NetManager.GetActivityRewardRequest(data.missionId,self.actData.activityId,function (_drop)
+ CheckRedPointStatus(RedPointType.PowerRiceGool)
UIManager.OpenPanel(UIName.RewardItemPopup,_drop,1,function()
PowerRice:Refresh(curIndex,false,false)
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua
index b4f11494fe..1897d1099d 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua
@@ -60,6 +60,8 @@ function RoleFlyUpLayout:InitComponent()
this.help=Util.GetGameObject(self.gameObject,"upStar/btns/help")
this.heroSource = Util.GetGameObject(self.gameObject,"upStar/btns/heroSource")
+
+ this.tip = Util.GetGameObject(self.gameObject,"upStar/tip"):GetComponent("Text")
end
--绑定事件(用于子类重写)s
@@ -113,6 +115,18 @@ function RoleFlyUpLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_h
isUpZhen = _isUpZhen
this:GetCurHeroUpLvOrUpStarSData()
this:UpdateHeroUpStarData()--进阶
+
+ if upStarRankUpConfig then
+ LogGreen("AddLv:"..HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv).." LimitHongmengLevel:"..upStarRankUpConfig.LimitHongmengLevel)
+ if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) >= upStarRankUpConfig.LimitHongmengLevel then -- 鸿蒙阵神将共鸣等级
+ this.upStarBtn.gameObject:SetActive(true)
+ this.tip.gameObject:SetActive(false)
+ else
+ this.upStarBtn.gameObject:SetActive(false)
+ this.tip.gameObject:SetActive(true)
+ this.tip.text = "飞升需求鸿蒙阵等级:"..upStarRankUpConfig.LimitHongmengLevel
+ end
+ end
end
--更新英雄进阶数据
diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
index f5a74d367f..d4f36a56d0 100644
--- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
@@ -322,19 +322,21 @@ function SacredTreePanel:OnShow()
self.attriNum.text = SacredTreeManager.CulAttri().."/"..#attriConfig.PropertyUnlcokLevels
--设置中间属性
self:SetAttriDetail()
+ self:ResetDetailPos()
end
function SacredTreePanel:SetAttriDetail()
local curSelectIndex = self.selectIndex
- if curTreeLevel <= 0 then
- self.attriDetail:SetActive(false)
- self.selectMask:SetActive(false)
- self.jtBtn:SetActive(false)
- else
+ -- if curTreeLevel <= 0 then
+ -- self.attriDetail:SetActive(false)
+ -- self.selectMask:SetActive(false)
+ -- self.jtBtn:SetActive(false)
+ -- else
self.attriDetail:SetActive(true)
self.selectMask:SetActive(true)
- self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0 and SacredTreeManager.CulAttri() < #attriConfig.PropertyUnlcokLevels )
+ self.jtBtn:SetActive(false)
+ --self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0 and SacredTreeManager.CulAttri() < #attriConfig.PropertyUnlcokLevels )
-- self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性")
self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1])
local data = SacredTreeManager.GetAttriDetail(curSelectIndex)
@@ -354,7 +356,7 @@ function SacredTreePanel:SetAttriDetail()
Util.GetGameObject(go,"nextAttri"):GetComponent("Text").text = value.text2
end
self:InitDetailPos()
- end
+ --end
end
function SacredTreePanel:InitDetailPos()
@@ -370,6 +372,7 @@ function SacredTreePanel:InitDetailPos()
end
function SacredTreePanel:ResetDetailPos()
+ self.bool=false
local length = self.bool and 170 + SacredTreeManager.CulAttri()*50 or 170 + #attriConfig.PropertyUnlcokLevels*50
local size = Vector2.New(1080,length)
local rotation = self.bool and 0 or 179