diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_01.png b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_01.png
new file mode 100644
index 0000000000..e87cb10ffb
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_01.png differ
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_01.png.meta b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_01.png.meta
new file mode 100644
index 0000000000..a449bd5452
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_01.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: cd3cb2c006d4a2f4799a3dcccb19c5e1
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 91c3aae27f11e0e4b9c82210fa22c93c
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MapAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_02.png b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_02.png
new file mode 100644
index 0000000000..2d6ee0b2d0
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_02.png differ
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_02.png.meta b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_02.png.meta
new file mode 100644
index 0000000000..5115e39834
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_jindu_02.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 8d2f1b761a5cdd743b353b7f2a4990ae
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 71efdd30432f02543a7f863e9b2e1cc3
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MapAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_shiqitishengzi.png b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_shiqitishengzi.png
new file mode 100644
index 0000000000..498f1f039c
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_shiqitishengzi.png differ
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_shiqitishengzi.png.meta b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_shiqitishengzi.png.meta
new file mode 100644
index 0000000000..807eb64e12
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_shiqitishengzi.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: bc514b5ec52827448947ef1c763bb3b8
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: f057d738439cacb42b266c0ab70cdc8a
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MapAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujimibaozi.png b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujimibaozi.png
new file mode 100644
index 0000000000..fcf1ccf73a
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujimibaozi.png differ
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujimibaozi.png.meta b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujimibaozi.png.meta
new file mode 100644
index 0000000000..78b400bced
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujimibaozi.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 3e841952f1989d54197a27b3341467d6
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 6e95c9f20d4a7774091b4aa070de0b3c
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MapAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujinmibaoanniu.png b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujinmibaoanniu.png
new file mode 100644
index 0000000000..0aa919738f
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujinmibaoanniu.png differ
diff --git a/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujinmibaoanniu.png.meta b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujinmibaoanniu.png.meta
new file mode 100644
index 0000000000..00b09155f4
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MapAtlas/r_wujin_wujinmibaoanniu.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 4aed892ecb679d94cac8af06f26a0a42
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 9997604790a990a4f84f25ece06da752
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MapAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab
index 1a1a8db5ff..431eb89a11 100644
--- a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab
@@ -36,7 +36,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 4.2, y: 101.900024}
+ m_AnchoredPosition: {x: -32.3, y: 102.7}
m_SizeDelta: {x: 571, y: 109}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &223869071
@@ -303,8 +303,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -1.29, y: 3.1499755}
- m_SizeDelta: {x: 358.95, y: 69.87}
+ m_AnchoredPosition: {x: 0.21, y: 4.54}
+ m_SizeDelta: {x: 334.26, y: 67.98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1445649200
CanvasRenderer:
@@ -336,11 +336,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 44
+ m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
- m_MaxSize: 46
+ m_MaxSize: 48
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -616,8 +616,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -2.2, y: -315.6}
- m_SizeDelta: {x: 876.7, y: 1057.6}
+ m_AnchoredPosition: {x: -2.2, y: -286.17}
+ m_SizeDelta: {x: 876.7, y: 1116.46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6567228654292680991
CanvasRenderer:
@@ -684,6 +684,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 4848900464562983047}
- {fileID: 2586287778450188548}
- {fileID: 1032463601789151751}
- {fileID: 3921217073352995077}
@@ -694,7 +695,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: -342.45, y: 0}
+ m_AnchoredPosition: {x: -279.5, y: -7.1}
m_SizeDelta: {x: 276.5, y: 82.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5224272919960919979
@@ -802,7 +803,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &8493555471523306560
RectTransform:
m_ObjectHideFlags: 0
@@ -815,13 +816,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8132533325127252831}
- m_RootOrder: 3
+ 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: -74, y: -18}
+ m_AnchoredPosition: {x: -74, y: -9.727274}
m_SizeDelta: {x: 33.27, y: 32.3}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0.756121}
--- !u!222 &3953803840446177709
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -990,12 +991,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8132533325127252831}
- m_RootOrder: 0
+ m_RootOrder: 1
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: -93.6, y: 1.3}
- m_SizeDelta: {x: 62, y: 68}
+ m_AnchoredPosition: {x: -91.36, y: 11.2}
+ m_SizeDelta: {x: 64.56, y: 70.81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1977855556940310246
CanvasRenderer:
@@ -1146,7 +1147,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: 4.5, y: -27}
+ m_AnchoredPosition: {x: 10.1, y: -32.6}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4995602110845495179
@@ -1363,7 +1364,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: 0.000000029384, y: -404}
+ m_AnchoredPosition: {x: 0.000000029384, y: -432.85}
m_SizeDelta: {x: 876.7, y: 168.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3869436977374417481
@@ -1553,7 +1554,7 @@ GameObject:
m_Component:
- component: {fileID: 5548363885730490346}
- component: {fileID: 5526173277039060411}
- - component: {fileID: 1737352495573707922}
+ - component: {fileID: 8485459836189766208}
m_Layer: 5
m_Name: BgImage
m_TagString: Untagged
@@ -1570,15 +1571,15 @@ RectTransform:
m_GameObject: {fileID: 2976605724187213015}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.1, y: 1.1, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8836622965762268863}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1080, y: 1920}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526173277039060411
CanvasRenderer:
@@ -1588,7 +1589,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2976605724187213015}
m_CullTransparentMesh: 0
---- !u!114 &1737352495573707922
+--- !u!114 &8485459836189766208
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1899,7 +1900,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8132533325127252831}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2020,8 +2021,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.6000197, y: 0}
- m_SizeDelta: {x: 860.5, y: 77.65}
+ m_AnchoredPosition: {x: -8.84, y: -77.650024}
+ m_SizeDelta: {x: 844.01, y: 155.3}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &2171549816907207518
MonoBehaviour:
@@ -2050,9 +2051,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 0
+ m_Left: 34
m_Right: 0
- m_Top: 0
+ m_Top: 9
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
@@ -2170,8 +2171,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -1.51, y: -0.85}
- m_SizeDelta: {x: 405.37, y: 98.29}
+ m_AnchoredPosition: {x: 37.5, y: -0.000053644}
+ m_SizeDelta: {x: 407.46, y: 109}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5153676182106814901
CanvasRenderer:
@@ -2246,7 +2247,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: 0.000031948, y: -121.32997}
+ m_AnchoredPosition: {x: -0.000029087, y: -154.15}
m_SizeDelta: {x: 876.7, y: 155.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &169960927233954564
@@ -2497,11 +2498,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8132533325127252831}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 111.08, y: 1.3}
+ m_AnchoredPosition: {x: 112.79, y: 9.2}
m_SizeDelta: {x: 340.32, y: 59.21}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &995434918788457674
@@ -2545,7 +2546,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 0
- m_Text: 211 / 100
+ m_Text:
--- !u!1 &6946382381450733063
GameObject:
m_ObjectHideFlags: 0
@@ -2582,7 +2583,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 860.5, y: 16}
+ m_SizeDelta: {x: 810.01, y: 16}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &4961086051323416824
CanvasRenderer:
@@ -2614,7 +2615,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 50
+ m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 5
@@ -2640,6 +2641,80 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
+--- !u!1 &7056024363524374413
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4848900464562983047}
+ - component: {fileID: 3218745289041225350}
+ - component: {fileID: 8256905402058901898}
+ m_Layer: 5
+ m_Name: Image (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4848900464562983047
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7056024363524374413}
+ 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: 8132533325127252831}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -22.065002, y: 4.405}
+ m_SizeDelta: {x: 232.37, y: 91.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3218745289041225350
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7056024363524374413}
+ m_CullTransparentMesh: 0
+--- !u!114 &8256905402058901898
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7056024363524374413}
+ 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: 235765a12571e8e4ca5d0a064f46db5e, 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 &7068069465327808914
GameObject:
m_ObjectHideFlags: 0
@@ -2671,12 +2746,12 @@ RectTransform:
m_Children:
- {fileID: 1896117615679019432}
m_Father: {fileID: 8132533325127252831}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -1.1, y: -33.2}
- m_SizeDelta: {x: 161.92, y: 41.6}
+ m_AnchoredPosition: {x: -14.76, y: -54.4}
+ m_SizeDelta: {x: 217.76, y: 41.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8054737097486219900
CanvasRenderer:
@@ -2972,8 +3047,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 329.1, y: -0.84999}
- m_SizeDelta: {x: 240.7, y: 91.1}
+ m_AnchoredPosition: {x: 370.6, y: -0.000048876}
+ m_SizeDelta: {x: 240.31, y: 91.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7933143977113983888
CanvasRenderer:
@@ -3253,7 +3328,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.2, y: -2.19}
+ m_AnchoredPosition: {x: 4.5, y: -35}
m_SizeDelta: {x: 330, y: 83}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1654278685390091607
@@ -3543,8 +3618,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.000011563, y: 0.18248}
- m_SizeDelta: {x: 126.55, y: 47.74}
+ m_AnchoredPosition: {x: -0.56499004, y: -0.000075579}
+ m_SizeDelta: {x: 216.63, y: 41.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3293864234157757307
CanvasRenderer:
@@ -3576,18 +3651,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 24
+ m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 50
- m_Alignment: 4
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 59:10
+ m_Text:
--- !u!1 &8610256016417640590
GameObject:
m_ObjectHideFlags: 0
@@ -3622,8 +3697,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 5.6, y: 2.585}
- m_SizeDelta: {x: 229.5, y: 85.9}
+ m_AnchoredPosition: {x: -2.5, y: 3.5}
+ m_SizeDelta: {x: 209.2, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &158605639531655189
CanvasRenderer:
@@ -3663,10 +3738,10 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u5730\u56FE\u96BE\u5EA6:"
+ m_Text:
LanguageIndex: 0
--- !u!1 &8798946416539645332
GameObject:
@@ -3703,7 +3778,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.2, y: -269.4}
+ m_AnchoredPosition: {x: 0.000012159, y: -304}
m_SizeDelta: {x: 330, y: 83}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7251423975282181306
diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab
index f0c95e7308..c51376f1d6 100644
--- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab
@@ -1243,7 +1243,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: 825.45, y: -1550}
+ m_AnchoredPosition: {x: 722, y: -1554}
m_SizeDelta: {x: 534.92, y: 123}
m_Pivot: {x: 0.52412736, y: 1.0000001}
--- !u!1 &1248917441218548
@@ -10999,7 +10999,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000030517578, y: 0}
- m_SizeDelta: {x: 74, y: 62}
+ m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8721743826705361849
CanvasRenderer:
@@ -11029,7 +11029,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 84b137e960461f44082b1491d6ce5b7b, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a11c6e44d046b624799fdcd7a93fe7f4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -11203,6 +11203,7 @@ GameObject:
- component: {fileID: 6306484587288268982}
- component: {fileID: 5069245933537704258}
- component: {fileID: 8462991344795805042}
+ - component: {fileID: 1635154337695112103}
m_Layer: 5
m_Name: lv
m_TagString: Untagged
@@ -11226,8 +11227,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 122.95004, y: -142}
- m_SizeDelta: {x: 245.9, y: 38}
+ m_AnchoredPosition: {x: 122.95, y: -87}
+ m_SizeDelta: {x: 245.9, y: 33}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6306484587288268982
CanvasRenderer:
@@ -11258,11 +11259,11 @@ MonoBehaviour:
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: 35
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
- m_MinSize: 10
+ m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@@ -11270,7 +11271,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "2\u7EA7"
+ m_Text:
--- !u!114 &8462991344795805042
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11285,6 +11286,21 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
+--- !u!114 &1635154337695112103
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 223916796749744016}
+ 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: 0.5}
+ m_EffectDistance: {x: 1, y: 1}
+ m_UseGraphicAlpha: 1
--- !u!1 &301557843766724639
GameObject:
m_ObjectHideFlags: 0
@@ -11310,17 +11326,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 301557843766724639}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3917868469460702196}
m_Father: {fileID: 7341570097136637704}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 51.9, y: -1.75}
+ m_AnchoredPosition: {x: 26.049995, y: 0}
m_SizeDelta: {x: 170.03, y: 125.69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1231867196936878268
@@ -12064,8 +12080,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 403, y: 123}
+ m_AnchoredPosition: {x: -27, y: 0}
+ m_SizeDelta: {x: 454.1, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1387233813948866169
CanvasRenderer:
@@ -12088,7 +12104,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.82745105, g: 0.654902, b: 0.30980393, a: 1}
+ m_Color: {r: 1, g: 0.83137256, b: 0.64705884, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -12097,18 +12113,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 14
+ m_FontSize: 30
m_FontStyle: 0
m_BestFit: 1
- m_MinSize: 14
- m_MaxSize: 40
- m_Alignment: 3
+ m_MinSize: 3
+ m_MaxSize: 30
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: New Text
+ m_Text:
--- !u!1 &969288888531432736
GameObject:
m_ObjectHideFlags: 0
@@ -12315,7 +12331,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9686275, g: 0.8588236, b: 0.58431375, a: 1}
+ m_Color: {r: 1, g: 0.9568628, b: 0.8666667, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -12323,11 +12339,11 @@ MonoBehaviour:
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: 14
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 30
m_FontStyle: 0
m_BestFit: 1
- m_MinSize: 14
+ m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@@ -22207,17 +22223,16 @@ RectTransform:
m_Children:
- {fileID: 8194689999499325142}
- {fileID: 8433638789124951170}
- - {fileID: 4051503872651549003}
- - {fileID: 8123701288940212222}
- - {fileID: 6478988459347142717}
- {fileID: 10753289631633309}
+ - {fileID: 4051503872651549003}
+ - {fileID: 6478988459347142717}
m_Father: {fileID: 6661436527163171077}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 234, y: 58}
+ m_AnchoredPosition: {x: -26.05, y: 0}
+ m_SizeDelta: {x: 181.9, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4781539944916265117
CanvasRenderer:
@@ -22446,7 +22461,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: 355, y: 13.5}
+ m_AnchoredPosition: {x: 410, y: 13.5}
m_SizeDelta: {x: 164.65, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5972399023571215247
@@ -22850,7 +22865,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -0}
- m_SizeDelta: {x: 245.9, y: 180}
+ m_SizeDelta: {x: 245.9, y: 120}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &7333828891075539731
CanvasRenderer:
@@ -22937,7 +22952,7 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
- m_Top: 142
+ m_Top: 87
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
@@ -27655,7 +27670,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 76.9}
- m_SizeDelta: {x: 129, y: 129}
+ m_SizeDelta: {x: 131, y: 132}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4375993435457993928
CanvasRenderer:
@@ -27685,7 +27700,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: a7a95556f3eb9014e8f57a9313ad3bc0, type: 3}
+ m_Sprite: {fileID: 21300000, guid: cd3cb2c006d4a2f4799a3dcccb19c5e1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -42959,8 +42974,8 @@ MonoBehaviour:
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 11.52
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &3552938148909637328
@@ -43093,8 +43108,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.000011563, y: 0.18248}
- m_SizeDelta: {x: 126.55, y: 47.74}
+ m_AnchoredPosition: {x: -0.0000061989, y: 0.18248}
+ m_SizeDelta: {x: 181.9, y: 47.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4996615903125027794
CanvasRenderer:
@@ -43258,7 +43273,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3699383530362916577}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: []
@@ -43267,7 +43282,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: -93.4, y: -0.000020981}
+ m_AnchoredPosition: {x: -66.39011, y: 0}
m_SizeDelta: {x: 52, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7166769928838543072
@@ -48659,7 +48674,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &6478988459347142717
RectTransform:
m_ObjectHideFlags: 0
@@ -58724,7 +58739,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000030517578, y: 0}
- m_SizeDelta: {x: 142, y: 129}
+ m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7215305706595346710
CanvasRenderer:
@@ -58754,7 +58769,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: f9398964d6d4cdf4db9b39ec0fc5f348, type: 3}
+ m_Sprite: {fileID: 21300000, guid: c9a0b331f741758438afc0728ed5c56d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -59510,7 +59525,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5233411363973018855}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: []
@@ -59519,8 +59534,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -68.4, y: -1.75}
- m_SizeDelta: {x: 151.24, y: 61.5}
+ m_AnchoredPosition: {x: 1.2900105, y: -1.75}
+ m_SizeDelta: {x: 83.36, y: 61.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6029984906076484684
CanvasRenderer:
@@ -59557,7 +59572,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
- m_Alignment: 5
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -98585,8 +98600,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 50, y: -537.06}
- m_SizeDelta: {x: 127, y: 129}
+ m_AnchoredPosition: {x: 50, y: -64.5}
+ m_SizeDelta: {x: 179, y: 173}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6423326558113150036
CanvasRenderer:
@@ -98616,7 +98631,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 56e562f2e809ff74f93897fff77286b0, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 4aed892ecb679d94cac8af06f26a0a42, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -99140,128 +99155,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &6416885964111586137
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8123701288940212222}
- - component: {fileID: 5137148887360190314}
- - component: {fileID: 7258527811165113856}
- - component: {fileID: 3912546889201618404}
- m_Layer: 5
- m_Name: text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8123701288940212222
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6416885964111586137}
- 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: 7341570097136637704}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 19.7, y: -2.895}
- m_SizeDelta: {x: 58.31, y: 59.21}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5137148887360190314
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6416885964111586137}
- m_CullTransparentMesh: 0
---- !u!114 &7258527811165113856
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6416885964111586137}
- 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: 0.88235295, b: 0.5647059, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 37
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: /
---- !u!114 &3912546889201618404
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6416885964111586137}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 0
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 7258527811165113856}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
--- !u!1 &6439282838349407886
GameObject:
m_ObjectHideFlags: 0
@@ -99622,7 +99515,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &10753289631633309
RectTransform:
m_ObjectHideFlags: 0
@@ -99636,12 +99529,12 @@ RectTransform:
m_Children:
- {fileID: 4466434583546828728}
m_Father: {fileID: 7341570097136637704}
- m_RootOrder: 5
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.00001502, y: -50.3}
- m_SizeDelta: {x: 161.92, y: 41.6}
+ m_AnchoredPosition: {x: -0.000011444092, y: -53.3}
+ m_SizeDelta: {x: 181.9, y: 41.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1595659191610556054
CanvasRenderer:
@@ -110137,7 +110030,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.000015258789}
- m_SizeDelta: {x: 403, y: 123}
+ m_SizeDelta: {x: 534.92, y: 70}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7388731893337549464
CanvasRenderer:
@@ -110167,7 +110060,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 0d3c780efce4ada4db6993deef309b76, type: 3}
+ m_Sprite: {fileID: 21300000, guid: b63515696b6d17842984053967560ae8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -111364,8 +111257,8 @@ GameObject:
m_Component:
- component: {fileID: 6435868022123484491}
- component: {fileID: 4556992764502876251}
- - component: {fileID: 2587628293385707010}
- component: {fileID: 4929303610836106666}
+ - component: {fileID: 8168330479755590655}
m_Layer: 5
m_Name: btnNote
m_TagString: Untagged
@@ -111403,35 +111296,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8883761951009376683}
m_CullTransparentMesh: 0
---- !u!114 &2587628293385707010
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8883761951009376683}
- 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: ad08503fa5d65df40a15bcb3243b28f1, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
--- !u!114 &4929303610836106666
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -111468,12 +111332,32 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 2587628293385707010}
+ m_TargetGraphic: {fileID: 8168330479755590655}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!114 &8168330479755590655
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8883761951009376683}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &8914263294445144087
GameObject:
m_ObjectHideFlags: 0
@@ -111501,7 +111385,7 @@ RectTransform:
m_GameObject: {fileID: 8914263294445144087}
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_LocalScale: {x: 1, y: -1, z: 1}
m_Children: []
m_Father: {fileID: 8127552058306234388}
m_RootOrder: 0
@@ -111509,7 +111393,7 @@ RectTransform:
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: 116, y: 116}
+ m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5759825484472295256
CanvasRenderer:
@@ -111532,19 +111416,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0.72350264, b: 1, a: 1}
+ 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: ec09cf9619972e5458020f1df5b33658, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 8d2f1b761a5cdd743b353b7f2a4990ae, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 1
- m_FillAmount: 0.54
+ m_FillAmount: 0
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
index 2478aac789..d531839ba8 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
@@ -129,7 +129,6 @@ function EndLessCarbonPanel:OnShow()
end
function this.InitActPowerShow()
- local total = EndLessMapManager.GetTotalEnergy()
local curEnergy = 0
curEnergy = BagManager.GetItemCountById(1)
@@ -204,7 +203,7 @@ function this.ShowCountTime()
-- 启动倒计时
this.timer = Timer.New(function ()
local leftTime = AutoRecoverManager.GetRecoverTime(1)
- this.actCountTime.text = GetTimeMaoHaoStrBySeconds(math.floor(leftTime))
+ this.actCountTime.text = GetTimeMaoHaoStrBySeconds(math.floor(leftTime)).."后恢复1点"
end, 1, -1, true)
this.timer:Start()
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua
index c9d72d7054..e2acba9348 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua
@@ -159,10 +159,6 @@ end
function FormationSetPanel:GetFormationHeroIdsByForMId(forMationId)
teamHero = {}
local teamHeroInfos = FormationManager.GetFormationByID(forMationId).teamHeroInfos
- --无尽副本队伍检测是否阵亡人员
- if forMationId == FormationTypeDef.FORMATION_ENDLESS_MAP then
- teamHeroInfos = EndLessMapManager.RoleListFormationNewMapTeam()
- end
for i = 1, #teamHeroInfos do
local info = {}
info.index = teamHeroInfos[i].position
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
index 0c1b9297ac..f6e4ec784e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
@@ -1,4 +1,4 @@
-EndLessMapManager = {};
+EndLessMapManager = {};
local this = EndLessMapManager
local endLessConfig = ConfigManager.GetConfig(ConfigName.EndlessMapConfig)
local gameSetting = ConfigManager.GetConfig(ConfigName.GameSetting)
@@ -38,6 +38,8 @@ function this.Initialize()
this.openedFormat = false
this.isSkipFight = 1 -- 服务器记录的是否跳过战斗
this.EndLessRoleDead = false -- 无尽副本角色进入死亡状态,走一步重置
+ this.shiQiValue = endlessMorale[1].Exp[1]
+ this.scoreValueId = endlessTreasure[1].Integral[1][1]
this.InitMissionData()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold,this.RefreshItemData)
end
@@ -280,18 +282,6 @@ function this.GetLeftEnergy(func)
NetManager.ReqeustRefreshEnergy(func)
end
--- 返回行动力上限。跟VIP挂钩
-function this.GetTotalEnergy()
- return PrivilegeManager.GetPrivilegeNumber(20)
-end
-
---判断当前的行动力是已经是上限
-function this.EnergyEnough()
- -- 地图里用显示的数据,地图外面用背包的数据
- local curEnergy = BagManager.GetItemCountById(1)
- local limitValue = this.GetTotalEnergy()
- return curEnergy >= limitValue
-end
-- 返回剩余行动力
function this.GetLeftMapEnergy()
@@ -415,7 +405,7 @@ function this.InitSingleEndlessHero(_msgHeroData)
heroData.pDef = heroData.heroConfig.PhysicalDefence
heroData.mDef = heroData.heroConfig.MagicDefence
heroData.speed = heroData.heroConfig.Speed
- heroData.skinId = _msgHeroData.skinId
+ heroData.skinId = _msgHeroData.skinId or 0
if heroData.skinId == 0 then
heroData.skinConfig = heroData.heroConfig
heroData.live = GetResourcePath(heroData.heroConfig.Live)
@@ -680,32 +670,33 @@ function this.GetHeroLeftBlood(heroId)
end
end
---编队界面有死亡猎妖师重组编队数据
-function this.RoleListFormationNewMapTeam()
- local newMapTeam = {} -- 地图中的编队数据
- local curTeam = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP)
- -- 成员数据
- if curTeam.teamHeroInfos and #curTeam.teamHeroInfos > 0 then
- for i = 1, #curTeam.teamHeroInfos do
- local roleData = curTeam.teamHeroInfos[i]
- local curRoleHp = 0
- if this.allHeroBlood[roleData.heroId] then
- curRoleHp = this.allHeroBlood[roleData.heroId].curHp
- else
- local allProp = HeroManager.CalculateWarAllProVal(roleData.heroId)
- curRoleHp = allProp[3]
- end
- if curRoleHp > 0 then
- local info = {}
- info.position = #newMapTeam+1--curTeam.teamHeroInfos[i].position
- info.heroId = roleData.heroId
- table.insert(newMapTeam,info)
- end
- end
- end
- FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ENDLESS_MAP, newMapTeam, curTeam.teamPokemonInfos)
- return newMapTeam
-end
+-- --编队界面有死亡猎妖师重组编队数据
+-- function this.RoleListFormationNewMapTeam()
+-- local newMapTeam = {} -- 地图中的编队数据
+-- local curTeam = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP)
+-- -- 成员数据
+-- if curTeam.teamHeroInfos and #curTeam.teamHeroInfos > 0 then
+-- for i = 1, #curTeam.teamHeroInfos do
+-- local roleData = curTeam.teamHeroInfos[i]
+-- local curRoleHp = 0
+-- if this.allHeroBlood[roleData.heroId] then
+-- curRoleHp = this.allHeroBlood[roleData.heroId].curHp
+-- else
+-- local allProp = HeroManager.CalculateWarAllProVal(roleData.heroId)
+-- curRoleHp = allProp[3]
+-- end
+-- if curRoleHp > 0 then
+-- local info = {}
+-- info.position = #newMapTeam+1--curTeam.teamHeroInfos[i].position
+-- info.heroId = roleData.heroId
+-- table.insert(newMapTeam,info)
+-- end
+-- end
+-- end
+-- FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ENDLESS_MAP, newMapTeam, curTeam.teamPokemonInfos)
+-- return newMapTeam
+-- end
+
-- 角色战斗失败,删除相应的地图队伍
function this.DeleteMapTeam()
for i = 1, #MapManager.formationList do
@@ -750,7 +741,8 @@ function this.InitMissionData()
local data = {}
data.Id = v.Id
data.index = #this.mission + 1
- data.info = v.Desc
+ data.Desc = v.Desc
+ data.info = ""
data.progress = 0
data.value = v.Values[2][1]
data.BoxReward = {}
@@ -770,11 +762,9 @@ function this.SetRewardData()
local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.wujinfuben)
for k,v in ipairs(this.mission) do
for j = 1,#allMissionData do
- -- LogGreen("allMissionData[j].missionId:"..allMissionData[j].missionId.." allMissionData[j].state :"..allMissionData[j].state )
+ LogGreen("allMissionData[j].missionId:"..allMissionData[j].missionId.." allMissionData[j].state :"..allMissionData[j].state .." allMissionData[j].progress:"..allMissionData[j].progress)
if v.Id == allMissionData[j].missionId then
- if v.progress == 0 then
- v.progress = allMissionData[j].progress
- end
+ v.progress = allMissionData[j].progress
if allMissionData[j].state == 2 then
v.state = 0
elseif allMissionData[j].state == 1 then
@@ -782,6 +772,7 @@ function this.SetRewardData()
elseif allMissionData[j].state == 0 then
v.state = 2
end
+ v.info = v.Desc ..("(")..v.progress.."/"..v.value..(")")
break
end
end
@@ -827,28 +818,26 @@ function this.GetRewardData()
return data
end
--------------------------------------------------------------------------士气-----------------------------------------------
-this.shiQiValue = 101
function this.GetShiQiValue()
local id = 0
local moraleLv1 = 0
local itemCount = BagManager.GetItemCountById(this.shiQiValue)
for k,v in ConfigPairs(endlessMorale) do
- if not v.Exp or v.Exp < 1 then
+ if not v.Exp or #v.Exp < 1 then
moraleLv1 = v.Level
id = v.Id
break
- elseif itemCount < v.Exp then
+ elseif itemCount < v.Exp[2] then
moraleLv1 = v.Level
id = v.Id
break
end
end
+ LogGreen("itemCount:"..itemCount.." moraleLv1:"..moraleLv1.." id:"..id)
return id,moraleLv1
end
------------------------------------------------------------------------------------秘宝-----------------------------------------------------
this.treasureLevel = 0
-this.scoreValueId = 102
-
function this.GetTreasureData()
this.treasureDataReward = {}
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.endlessTreasure)) do
@@ -878,7 +867,7 @@ function this.GetTreasureLevel()
local moraleLv1 = 0
local itemCount = BagManager.GetItemCountById(this.scoreValueId)
for k,v in ConfigPairs(endlessTreasure) do
- if not v.Integral then
+ if not v.Integral or #v.Integral < 1 then
moraleLv1 = v.Level
id = v.Id
break
@@ -899,7 +888,7 @@ function this.InitTreasureData(msg)
this.treasureData = {}
this.treasureData.tip = "无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝"
--重置时间
- -- LogGreen("msg.resetTime:"..msg.resetTime)
+ LogGreen("msg.resetTime:"..msg.resetTime)
this.treasureData.resetTime = msg.resetTime
--购买状态
-- LogGreen("msg.isBuy:"..msg.isBuy)
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
index 397109f425..c881b78432 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
@@ -322,9 +322,10 @@ function EndLessMapView:ShowHeroData()
if not this.heroList then
this.heroList = {}
end
- LogGreen("this.heroList:"..#this.heroList)
for k = 1, #this.heroList do
- this.heroList[k].go.gameObject:SetActive(false)
+ if this.heroList[k] and this.heroList[k].go then
+ this.heroList[k].go.gameObject:SetActive(false)
+ end
end
for i, v in ipairs(curFormation.teamHeroInfos) do
if not this.heroList[i] then
@@ -344,37 +345,38 @@ function EndLessMapView:ShowHeroData()
this.heroList[i].heroId = v.heroId
local heroData = HeroManager.GetSingleHeroData(v.heroId)
this.heroList[i].frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, v.star))
- SetHeroIcon(v,this.heroList[i].icon,heroData.heroConfig)
+ SetHeroIcon(this.spLoader,heroData,this.heroList[i].icon,heroData.heroConfig)
this.heroList[i].pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
this.heroList[i].lv.text=heroData.lv
- SetHeroStars(this.heroList[i].star, heroData.star)
-
+ --spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation
+ SetHeroStars(this.spLoader,this.heroList[i].star, heroData.star)
+ local heroData1 = EndLessMapManager.allHeroBlood[v.heroId]
--血量相关
- this.heroList[i].hpExp.value=heroData.hp/10000
- Util.SetGray(this.heroList[i].go,heroData.hp<=0)--死啦
+ this.heroList[i].hpExp.value=heroData1.percentHp
+ Util.SetGray(this.heroList[i].go,heroData1.percentHp<=0)--死啦
end
end
function EndLessMapView:RefreshTargetRoote()
this.curMission = EndLessMapManager.GetRewardData()
if this.curMission.state == 0 then
- this.TargetBtn1.gameObject:SetActive(true)
- this.TargetBtn2.gameObject:SetActive(false)
- this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.info,this.curMission.progress,this.curMission.value)
- else
this.TargetBtn1.gameObject:SetActive(false)
this.TargetBtn2.gameObject:SetActive(true)
+ this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.Desc,this.curMission.progress,this.curMission.value)
+ else
+ this.TargetBtn1.gameObject:SetActive(true)
+ this.TargetBtn2.gameObject:SetActive(false)
if this.curMission.index == #EndLessMapManager.mission and this.curMission.state == 2 then
- this.TargetRootText.text = "已完成全部任务"
+ this.TargetRootText.text = "已完成全部任务"
else
- this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.info,this.curMission.progress,this.curMission.value)
+ this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.Desc,this.curMission.progress,this.curMission.value)
end
end
end
function EndLessMapView:SetShiQiValue()
local cursinglePro
- local itemCount = BagManager.GetItemCountById(this.shiQiValue)
+ local itemCount = BagManager.GetItemCountById(EndLessMapManager.shiQiValue)
local id, lv = EndLessMapManager.GetShiQiValue()
if lv ~= EndLessMapManager.moraleLv then
isShow = true
@@ -382,9 +384,9 @@ function EndLessMapView:SetShiQiValue()
EndLessMapManager.moraleLv = lv
EndLessMapManager.moraleId = id
end
- this.shiQiProgress.text = (endlessMorale[id].Exp and endlessMorale[id].Exp > 0) and itemCount.."/"..endlessMorale[id].Exp or "1/1"
- this.shiQiLv.text = lv
- this.shiQifillAmount = (endlessMorale[id].Exp and endlessMorale[id].Exp > 0) and itemCount/endlessMorale[id].Exp or 1
+ this.shiQiProgress.text = (endlessMorale[id].Exp[2] and endlessMorale[id].Exp[2] > 0) and itemCount.."/"..endlessMorale[id].Exp[2] or "1/1"
+ this.shiQiLv.text = lv.."级"
+ this.shiQifillAmount = (endlessMorale[id].Exp[2] and endlessMorale[id].Exp[2] > 0) and itemCount/endlessMorale[id].Exp[2] or 1
@@ -472,36 +474,6 @@ function EndLessMapView:InitBoolState()
end
-- ===================================================
-- ========= 各种按键操作的设置 =========================
--- 复位设置
-function EndLessMapView:ResetRoleState()
- --if not this:CanClick() then return end
- -- 重置角色位置(目前没有表现,做一下延迟)
- Timer.New(function ()
- -- 通信一次
- NetManager.RequestResetState(function ()
- PopupTipPanel.ShowTip(Language[11279])
- -- 初始位置
- local position = challengeMapConfig[MapManager.curMapId].Position
- local initPos = position[1] * 256 + position[2]
- -- 前端同步位置
- MapManager.curPos = initPos
- -- 重置队伍以及妖灵师的血量, 同时重置位置
- Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnResetFormationHp, initPos)
- -- 请求一次血量, 复位之后请求一次血量
- NetManager.RequestAllHeroHp(function ()
- --Log("复位之后请求一次血量数据")
- end)
- -- 刷新迷雾
- local u,v = Map_Pos2UV(initPos)
- TileMapView.UpdateWarFog(u, v, MapManager.fogSize)
- FormationManager.SetOneKeyGoWithoutUI(FormationTypeDef.FORMATION_ENDLESS_MAP,20)
- end)
- end, 0.2):Start()
-
- -- 进入复位状态
- EndLessMapManager.isReset = true
-
-end
-- 标记设置
function EndLessMapView:SetNoteShow()
@@ -596,14 +568,9 @@ function EndLessMapView:RefreshEnergyValue(isInit, costType)
EndLessMapManager.leftEnergy = curEnergy
EndLessMapManager.isHungery()
this:RefreshEnergyShow()
-
- -- 行动力从满状态切换到不满时启动定时器, 告诉服务器我走了
- if preEnergy == EndLessMapManager.GetTotalEnergy() and curEnergy < EndLessMapManager.GetTotalEnergy() then
- MapManager.MapUpdateEvent(-1000, function ()
- Log("满行动力状态切换同步倒计时")
- this:ShowCountTime()
- end)
- end
+ MapManager.MapUpdateEvent(-1000, function ()
+ this:ShowCountTime()
+ end)
end
-- 刷新行动力组件显示
@@ -612,7 +579,6 @@ function EndLessMapView:RefreshEnergyShow()
if curEnergy <= 0 then
ctrlView.StopWalk()
end
- local totalEnergy = EndLessMapManager.GetTotalEnergy()
-- 设置一下颜色
local str = ""
@@ -624,7 +590,7 @@ function EndLessMapView:RefreshEnergyShow()
end
this.energyInfo.text = str
- this.totalEnergy.text = totalEnergy
+ this.totalEnergy.text = ""
end
-- 刷新数值
@@ -647,14 +613,14 @@ end
-- 无尽副本中角色死翘翘
function EndLessMapView:OnRoleDead()
- this:RefreshEnergyValue(false, COST_TYPE.DEAD)
- -- 死亡退出触发事件状态
- EndLessMapManager.isTrigger = false
- -- 看看是否是死光光了
- if EndLessMapManager.IsAllDead() then
- PopupTipPanel.ShowTip(Language[11282])
- this:ResetRoleState()
- end
+ -- this:RefreshEnergyValue(false, COST_TYPE.DEAD)
+ -- -- 死亡退出触发事件状态
+ -- EndLessMapManager.isTrigger = false
+ -- -- 看看是否是死光光了
+ -- if EndLessMapManager.IsAllDead() then
+ -- PopupTipPanel.ShowTip(Language[11282])
+ -- this:ResetRoleState()
+ -- end
end
-- 无尽副本在地图之间传送
@@ -677,31 +643,21 @@ end
-- 行动力是否显示倒计时
function EndLessMapView:ShowCountTime()
- this.timer = nil
- this.actCountTime.text = ""
- this.bgTime:SetActive(not EndLessMapManager.EnergyEnough())
- -- 初始化是判断一次
- if not EndLessMapManager.EnergyEnough() then
- -- 启动倒计时
- this.timer = Timer.New(function ()
- local leftTime = AutoRecoverManager.GetRecoverTime(1)
- if EndLessMapManager.EnergyEnough()then
- -- 行动力恢复已满
- this.actCountTime.text = ""
- if this.isPanelClose then
- if this.timer then
- this.timer:Stop()
- end
- this.bgTime:SetActive(false)
- end
- else
- if not this.isPanelClose then
- this.actCountTime.text = GetTimeMaoHaoStrBySeconds(math.floor(leftTime))
- end
- end
- end, 1, -1, true)
- this.timer:Start()
+ if this.timer then
+ this.timer:Stop()
+ this.timer = nil
end
+
+ this.actCountTime.text = ""
+ this.bgTime:SetActive(true)
+
+ this.timer = Timer.New(function ()
+ local leftTime = AutoRecoverManager.GetRecoverTime(1)
+ if not this.isPanelClose then
+ this.actCountTime.text = GetTimeMaoHaoStrBySeconds(math.floor(leftTime)).."后恢复1点"
+ end
+ end, 1, -1, true)
+ this.timer:Start()
end
--- ==========================================================
diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua
index 95c1a5520a..7ea3da441b 100644
--- a/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua
@@ -22,6 +22,7 @@ function this.UpdateEventPoint(msg, optionId, func)
-- 下一个事件ID
this.nextEventId = msg.eventId
-- 行为类型
+ LogGreen("msg.EventBehaviorCommon.behaviorType:"..msg.EventBehaviorCommon.behaviorType)
local behaviorType = msg.EventBehaviorCommon.behaviorType
-- 推任务专用消息
-- --LogGreen("msg中返回的事件ID是 ".. (msg.eventId or "无事件id"))
@@ -284,6 +285,14 @@ function this.UpdateEventPoint(msg, optionId, func)
{"Buff", {buffID = beArgs[1][1]}},
{"DeletePoint", {pos = MapManager.curTriggerPos}},
}
+ elseif behaviorType == 52 then -- 战斗并销毁指定地图点
+ behaviorNodeList = {
+ {"Battle", {monsterID = beArgs[1][1]}, this.SetNextEventId},
+ {"MapProgressChange", {type = 2, curEventID = 0, monsterID = beArgs[1][1]}},
+ {"DeletePoint", {pointID = {beArgs[1][2]}}},
+ }
+ elseif behaviorType == 53 then -- 战斗并销毁指定地图点
+
end
-- 没有行为
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 7ff04ec10f..3ca9749252 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -367,19 +367,20 @@ function this.MapInfoRequest(mapModeId,func)
local msg = MapInfoProto_pb.MapEnterResponse()
msg:ParseFromString(data)
MapManager.curMapId = msg.mapId
-
+ --森罗幻境 英雄
local heros = msg.infos
if heros then
table.sort(heros,function (a,b)
return a.position < b.position
end)
end
- MapManager.trialHeroInfo = heros
+ MapManager.trialHeroInfo = heros
MapTrialManager.curTowerLevel = msg.curTower
MapTrialManager.bombUsed = msg.bombUsed
MapTrialManager.killCount=msg.killCount
MapTrialManager.powerValue = msg.essenceValue
MapTrialManager.InitTrialRewardData(msg.trialRewardInfo)
+
MapManager.mapPointList = {}
EndLessMapManager.PointNoteDataList = {}
MapManager.InitData(msg)
@@ -5029,9 +5030,9 @@ function this.AllEndLessHeroDataResponse(_index,func)
local msg = HeroInfoProto_pb.GetEndlessHeroListInfoResponse()
msg:ParseFromString(data)
EndLessMapManager.InitAllEndlessHero(msg.heroList,true)
- for i = 1 ,#msg.heroList do
- LogGreen(msg.heroList[i].id.." "..msg.heroList[i].heroId)
- end
+ -- for i = 1 ,#msg.heroList do
+ -- LogGreen(msg.heroList[i].id.." "..msg.heroList[i].heroId)
+ -- end
if msg.isSendFinish then
EndLessMapManager.InitMapInfoData(msg.endlessMapId)
if func then
@@ -5064,6 +5065,7 @@ function NetManager.EndlessTakeTreasureRequest(uid,func)
Network:SendMessageWithCallBack(MessageTypeProto_pb.ENDLESS_TAKE_REWARD_REQUEST , MessageTypeProto_pb.ENDLESS_TAKE_REWARD_RESPONSE , msg, function(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.EndlessTakeTreasureResponse()
+ msg:ParseFromString(data)
if func then
func(msg)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
index a7194d6628..a3831a96fc 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
@@ -137,7 +137,7 @@ function this.RefreshItemNumBySerTime()
for i, itemId in pairs(needRefreshItemTabs) do
--一些类型的特殊判断
if itemId == 1 then--行动力
- if not EndLessMapManager.isTrigger and not EndLessMapManager.EnergyEnough() then-- 已经是行动力的上限不再刷新-- 正在正在触发事件不刷新
+ if not EndLessMapManager.isTrigger then-- 已经是行动力的上限不再刷新-- 正在正在触发事件不刷新
this.RefreshItemNumById(itemId)
end
elseif itemId == 44 then--外敌挑战券
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
index e6c9534a3c..ed9d12e17e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
@@ -139,6 +139,7 @@ function RewardItemPopup:OnOpen(...)
end
--如果没有compShowType和Drop--背包已满
if not args[4] and (not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1)) then
+ LogGreen("掉落为空")
self:ClosePanel()
return
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
index a36ce8e900..523d7851ec 100644
--- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
@@ -33,7 +33,7 @@ function this.InitTypeTaskList(_userMissionList)
userMissionList.takeTimes = _userMissionList[i].takeTimes
userMissionList.heroId = _userMissionList[i].heroId
userMissionList.lock = _userMissionList[i].lock
- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock)
+ LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
if not TypeTaskData[_userMissionList[i].type] then
TypeTaskData[_userMissionList[i].type] = {}
end
@@ -157,7 +157,6 @@ end
--(后台推送刷新调用)
function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId,lock)
- --LogError("任务 "..type.." id:"..Id.." state:"..state.." progress "..progress)
if not TypeTaskData[type] then
TypeTaskData[type] = {}
end
@@ -207,7 +206,7 @@ end
function this.RefreshTypeTaskInfo(taskInfoList)
for i = 1, #taskInfoList do
local taskInfo = taskInfoList[i]
- -- Log("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes)
+ LogRed("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes)
this.SetTypeTaskInfo(taskInfo.type, taskInfo.missionId, taskInfo.state, taskInfo.progress, taskInfo.takeTimes,taskInfo.heroId,taskInfo.lock)
end
Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged)
diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua
index 4800067ea6..91b3b80ccf 100644
--- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua
@@ -85,7 +85,7 @@ end
--任务列表
function EndLessTreasurePanel:showTaskList()
itemnum = BagManager.GetItemCountById(EndLessMapManager.scoreValueId) or 0
- self.scoreText.text = BagManager.GetItemCountById(itemnum)
+ self.scoreText.text = itemnum
if not self.itemsList then
self.itemsList = {}
end
@@ -214,17 +214,19 @@ function EndLessTreasurePanel:OnBtnDealClicked(rewardItem,singleData)
PopupTipPanel.ShowTip(Language[11330])
elseif singleData.state == 3 or singleData.state == 2 then
NetManager.EndlessTakeTreasureRequest(singleData.Id,function(msg)
- UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
- --需要刷新界面
- if self.treasureData.treasureState == 0 then--判断是否已经购买了礼包
- EndLessMapManager.SetTreasureState(singleData.Id,1)
- else
- EndLessMapManager.SetTreasureState(singleData.Id,-1)
- end
- self:refresh()--刷新界面
+
+ UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
+ --需要刷新界面
+ if self.treasureData.treasureState == 0 then--判断是否已经购买了礼包
+ EndLessMapManager.SetTreasureState(singleData.Id,1)
+ else
+ EndLessMapManager.SetTreasureState(singleData.Id,-1)
+ end
+ self:refresh()--刷新界面
+ end)
end)
elseif singleData.state == 1 then
- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,1)
+ UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,3)
end
end