diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_gailvjiaobiao.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_gailvjiaobiao.png
new file mode 100644
index 0000000000..f50a1bb66d
Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_gailvjiaobiao.png differ
diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_gailvjiaobiao.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_gailvjiaobiao.png.meta
new file mode 100644
index 0000000000..9437311d76
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_gailvjiaobiao.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 6c4da2d9fdd765046a82908df135dc39
+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: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 90ec45784440ef041a29a440f60a7780
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: CarbonAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_shoucijiaobiao.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_shoucijiaobiao.png
new file mode 100644
index 0000000000..6d28b98d3e
Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_shoucijiaobiao.png differ
diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_shoucijiaobiao.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_shoucijiaobiao.png.meta
new file mode 100644
index 0000000000..c0a09722ec
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_shoucijiaobiao.png.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 682a7de0ef16f9f45b32245efa7f74b0
+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: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: b5b6afe93f8c6d9428fa5a0d8d3234fc
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: CarbonAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab
index 8a383aa727..537da612b3 100644
--- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab
@@ -36227,7 +36227,7 @@ GameObject:
- component: {fileID: 5829210635216211838}
- component: {fileID: 1660103616642101012}
m_Layer: 5
- m_Name: Text
+ m_Name: remainTimes
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab
index 773c22ae3f..a053ce5a95 100644
--- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab
@@ -31,7 +31,7 @@ RectTransform:
m_Children:
- {fileID: 3408442198697653928}
m_Father: {fileID: 3233073780574710381}
- m_RootOrder: 6
+ 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}
@@ -110,7 +110,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, y: 0}
+ m_AnchoredPosition: {x: -12.4, y: 20.1}
m_SizeDelta: {x: 1787.8, y: 417}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &575870043181212604
@@ -150,144 +150,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1591583129847824486
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8853484662739533017}
- - component: {fileID: 4595337359078345685}
- - component: {fileID: 833583379247254965}
- - component: {fileID: 3040345544897667162}
- - component: {fileID: 2764439520973159426}
- m_Layer: 5
- m_Name: noOpenBtn
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &8853484662739533017
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1591583129847824486}
- 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: 4635064493887040893}
- m_Father: {fileID: 3408442198697653928}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 1449.75, y: -227.24}
- m_SizeDelta: {x: 427.71, y: 153.92}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4595337359078345685
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1591583129847824486}
- m_CullTransparentMesh: 0
---- !u!114 &833583379247254965
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1591583129847824486}
- 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: 654f4293b5e1fbc419f6b14a1c035989, 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 &3040345544897667162
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1591583129847824486}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 3
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 833583379247254965}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
---- !u!95 &2764439520973159426
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1591583129847824486}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1662264561979808470
GameObject:
m_ObjectHideFlags: 0
@@ -320,7 +182,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3233073780574710381}
- m_RootOrder: 8
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -534,7 +396,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3233073780574710381}
- m_RootOrder: 5
+ 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}
@@ -582,226 +444,8 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A5\u592923\u5C0F\u65F6\uFF08\u6FC0\u6D3B\u7279\u6743\u53EF\u589E\u52A0\u6B21\u6570\uFF09"
+ m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A5\u592923\u5C0F\u65F6"
LanguageIndex: 10242
---- !u!1 &2149179182102348930
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4536892552784718216}
- - component: {fileID: 5067782459976562960}
- - component: {fileID: 116210377674469483}
- - component: {fileID: 7871005953007049144}
- - component: {fileID: 6549979514702418933}
- m_Layer: 5
- m_Name: goBtn
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &4536892552784718216
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2149179182102348930}
- 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: 8163449913301594198}
- m_Father: {fileID: 3408442198697653928}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 1449.75, y: -227.24}
- m_SizeDelta: {x: 427.71, y: 153.92}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5067782459976562960
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2149179182102348930}
- m_CullTransparentMesh: 0
---- !u!114 &116210377674469483
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2149179182102348930}
- 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: addacd5860691b74db509358d99a6dfb, 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 &7871005953007049144
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2149179182102348930}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 3
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 116210377674469483}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
---- !u!95 &6549979514702418933
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2149179182102348930}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &2550785984310202768
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4635064493887040893}
- - component: {fileID: 8065929375698385460}
- - component: {fileID: 7862191862452193100}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4635064493887040893
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2550785984310202768}
- 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: 8853484662739533017}
- 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: 207.1, y: -76.96}
- m_SizeDelta: {x: 381.87, y: 125.73}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8065929375698385460
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2550785984310202768}
- m_CullTransparentMesh: 0
---- !u!114 &7862191862452193100
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2550785984310202768}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.23137255, g: 0.23137255, b: 0.23137255, 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: 83
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 84
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u626B\u8361"
- LanguageIndex: 10244
--- !u!1 &3186609871897553618
GameObject:
m_ObjectHideFlags: 0
@@ -815,7 +459,7 @@ GameObject:
- component: {fileID: 3397944106902174464}
- component: {fileID: 3289200219704205822}
m_Layer: 5
- m_Name: XuanYuanMirrorPanel
+ m_Name: XuanYuanMirrorPanelList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -832,14 +476,17 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 5562918053752446121}
+ - {fileID: 2087026551871257240}
+ - {fileID: 9120179436019198566}
+ - {fileID: 1718735420007287841}
+ - {fileID: 1592525053790943440}
- {fileID: 3233073780574710381}
m_Father: {fileID: 0}
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_AnchoredPosition: {x: -297, y: -617}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3397189518254114580
@@ -916,17 +563,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 2087026551871257240}
- - {fileID: 9120179436019198566}
- - {fileID: 1718735420007287841}
- - {fileID: 1592525053790943440}
- {fileID: 3753356304809304800}
- {fileID: 4999213227612767911}
+ - {fileID: 8913978495380301828}
- {fileID: 575870042541593200}
- {fileID: 1198983249173518002}
- {fileID: 1444424565373780552}
m_Father: {fileID: 3395763085718138868}
- m_RootOrder: 1
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -972,7 +616,7 @@ RectTransform:
- {fileID: 6948521794554378020}
- {fileID: 6551732854407264896}
m_Father: {fileID: 3233073780574710381}
- m_RootOrder: 4
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1092,14 +736,15 @@ RectTransform:
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_Children:
+ - {fileID: 465888206083986401}
m_Father: {fileID: 3408442198697653928}
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: -285.5, y: -49.3}
- m_SizeDelta: {x: 1029.2, y: 252.9}
+ m_AnchoredPosition: {x: -319.2, y: 0.6}
+ m_SizeDelta: {x: 1096.6, y: 352.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6899759931426735578
MonoBehaviour:
@@ -1220,7 +865,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1592525053790943440
RectTransform:
m_ObjectHideFlags: 0
@@ -1233,7 +878,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8967058125376658246}
- m_Father: {fileID: 3233073780574710381}
+ m_Father: {fileID: 3395763085718138868}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1309,14 +954,12 @@ RectTransform:
- {fileID: 6403195048930280866}
- {fileID: 6530197106428225390}
- {fileID: 6706942462312295341}
- - {fileID: 4536892552784718216}
- - {fileID: 8853484662739533017}
m_Father: {fileID: 575870042541593200}
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: -3363, y: 512}
+ m_AnchoredPosition: {x: -2796, y: 499}
m_SizeDelta: {x: 1787.82, y: 416.94}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4968116100166111846
@@ -1495,7 +1138,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1718735420007287841
RectTransform:
m_ObjectHideFlags: 0
@@ -1508,7 +1151,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2859078147528115499}
- m_Father: {fileID: 3233073780574710381}
+ m_Father: {fileID: 3395763085718138868}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1720,7 +1363,7 @@ GameObject:
- component: {fileID: 5800648590357579774}
- component: {fileID: 6678590105079234266}
m_Layer: 5
- m_Name: moppingBtn
+ m_Name: btnFight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2002,7 +1645,7 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u63A8\u8350\u6218\u529B: "
---- !u!1 &7095696929461881100
+--- !u!1 &7246116345825792747
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2010,64 +1653,64 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5562918053752446121}
- - component: {fileID: 2958531907670594204}
- - component: {fileID: 259877012709830858}
+ - component: {fileID: 1053969568142576413}
+ - component: {fileID: 7973158424465276962}
+ - component: {fileID: 7032990428352246149}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &5562918053752446121
+ m_IsActive: 1
+--- !u!224 &1053969568142576413
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7095696929461881100}
+ m_GameObject: {fileID: 7246116345825792747}
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: 3395763085718138868}
+ m_Father: {fileID: 8913978495380301828}
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_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 33.549, y: 34.85}
+ m_SizeDelta: {x: -67.099, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2958531907670594204
+--- !u!222 &7973158424465276962
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7095696929461881100}
+ m_GameObject: {fileID: 7246116345825792747}
m_CullTransparentMesh: 0
---- !u!114 &259877012709830858
+--- !u!114 &7032990428352246149
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7095696929461881100}
+ m_GameObject: {fileID: 7246116345825792747}
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_Color: {r: 0.70980394, g: 0.3019608, b: 0.32156864, 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: fecb5ee3663610f4cb01fc18039e0bf0, type: 3}
+ m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2076,86 +1719,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &7318575209267228147
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8163449913301594198}
- - component: {fileID: 2526764558063508126}
- - component: {fileID: 5239797756712342348}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8163449913301594198
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7318575209267228147}
- 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: 4536892552784718216}
- 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: 207.1, y: -76.96}
- m_SizeDelta: {x: 381.87, y: 125.73}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2526764558063508126
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7318575209267228147}
- m_CullTransparentMesh: 0
---- !u!114 &5239797756712342348
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7318575209267228147}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.52156866, g: 0.31764707, b: 0.22352941, 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: 83
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 84
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u626B\u8361"
- LanguageIndex: 10244
--- !u!1 &7414078346221039944
GameObject:
m_ObjectHideFlags: 0
@@ -2389,6 +1952,87 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1.3
m_Text: "\u5996\u7CFB\u795E\u5C06\u989D\u5916\u9020\u621050%\u4F24\u5BB3\n\u975E\u5996\u7CFB\u795E\u5C06\u964D\u4F4E50%\u653B\u51FB\u529B"
+--- !u!1 &8533936638022848459
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8913978495380301828}
+ - component: {fileID: 2009070379428583229}
+ - component: {fileID: 5436355714893024474}
+ m_Layer: 5
+ m_Name: vipTips
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8913978495380301828
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8533936638022848459}
+ 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: 1053969568142576413}
+ m_Father: {fileID: 3233073780574710381}
+ 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: 326.19, y: -1658}
+ m_SizeDelta: {x: 652.38, y: 133.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2009070379428583229
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8533936638022848459}
+ m_CullTransparentMesh: 0
+--- !u!114 &5436355714893024474
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8533936638022848459}
+ 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.9215687, b: 0.77647066, 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: 65
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 70
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\uFF08\u6FC0\u6D3B\u7279\u6743\u53EF\u589E\u52A0\u6B21\u6570\uFF09"
+ LanguageIndex: 10242
--- !u!1 &8859213048692463355
GameObject:
m_ObjectHideFlags: 0
@@ -2406,7 +2050,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &9120179436019198566
RectTransform:
m_ObjectHideFlags: 0
@@ -2419,7 +2063,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4194524278559917133}
- m_Father: {fileID: 3233073780574710381}
+ m_Father: {fileID: 3395763085718138868}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2560,7 +2204,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &2087026551871257240
RectTransform:
m_ObjectHideFlags: 0
@@ -2573,7 +2217,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8468937203654416970}
- m_Father: {fileID: 3233073780574710381}
+ m_Father: {fileID: 3395763085718138868}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2648,7 +2292,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3233073780574710381}
- m_RootOrder: 7
+ 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}
@@ -2692,3 +2336,427 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1001 &389999713034440023
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 6403195048930280866}
+ m_Modifications:
+ - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3}
+ propertyPath: m_Name
+ value: ItemView
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 135
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 135
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224164726196709940, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224164726196709940, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224164726196709940, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224164726196709940, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224120784241422552, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224120784241422552, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224120784241422552, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224120784241422552, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224997239590791172, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224997239590791172, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224997239590791172, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224997239590791172, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224510889889894326, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224510889889894326, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224510889889894326, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224510889889894326, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224190957601355656, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224190957601355656, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224190957601355656, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224190957601355656, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224124898933367376, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224124898933367376, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224124898933367376, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224124898933367376, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224204118388095184, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224204118388095184, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224204118388095184, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224204118388095184, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224943970369353850, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224943970369353850, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224943970369353850, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224943970369353850, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224429285742949260, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224429285742949260, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224429285742949260, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224429285742949260, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224062058703742872, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224062058703742872, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224062058703742872, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224062058703742872, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8491108563067923294, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8491108563067923294, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8491108563067923294, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8491108563067923294, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1058181785866111226, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1058181785866111226, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1058181785866111226, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1058181785866111226, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6161300082361660746, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6161300082361660746, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6161300082361660746, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6161300082361660746, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 261830158491351853, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 261830158491351853, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 261830158491351853, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 261830158491351853, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5971156066927596181, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5971156066927596181, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5971156066927596181, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5971156066927596181, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3}
+--- !u!224 &465888206083986401 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
+ type: 3}
+ m_PrefabInstance: {fileID: 389999713034440023}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index cadf877cd5..02ef590407 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -730,7 +730,12 @@ RedPointType = {
Expedition = 9100, --副本界面
Expedition_Treasure = 9101,--天宫秘宝按钮
- TimeLimited = 10001 --显示招募
+ TimeLimited = 10001, --显示招募
+
+ Magic_Mirror = 10002, --妖灵宝镜
+ People_Mirror = 10003, --人杰宝镜
+ Buddhist_Mirror = 10004, --佛禅宝镜
+ Taoist_Mirror = 10005 , --道玄宝镜
}
RedPointStatus = {
@@ -1151,6 +1156,10 @@ FUNCTION_OPEN_TYPE = {
DAILYCHALLENGE_HERODEBRIS=69,--每日角色碎片副本
DAILYCHALLENGE_TALISMAN=70,--每日法宝副本
DAILYCHALLENGE_SOULPRINT=71,--每日魂印副本
+ MAGIC_MIRROR=74,--妖灵宝镜
+ PEOPLE_MIRROR=75,--人杰宝镜
+ BUDDHIST_MIRROR=76,--佛禅宝镜
+ TAOIST_MIRROR=77,--道玄宝镜
}
TaskGetBtnIconDef = {
@@ -1326,6 +1335,7 @@ HELP_TYPE = {
TimeLimitedCall=57,-- 限时召唤
TreasureOfHeaven=58,--天宫秘宝
QianKunBox=59,--乾坤宝囊
+ XuanYuanMirror=60,--轩辕宝镜
}
NumToComplexFont = {
diff --git a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
index 3522a0aafb..9fc4436283 100644
--- a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
@@ -39,6 +39,8 @@ CHAMPIONGETINFORESPONSE_MYRANK_FIELD = protobuf.FieldDescriptor();
CHAMPIONGETINFORESPONSE_MAXRANK_FIELD = protobuf.FieldDescriptor();
CHAMPIONGETINFORESPONSE_CHAMPIONBATTLEINFO_FIELD = protobuf.FieldDescriptor();
CHAMPIONGETINFORESPONSE_MYSCORE_FIELD = protobuf.FieldDescriptor();
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD = protobuf.FieldDescriptor();
+CHAMPIONGETINFORESPONSE_LOSER_FIELD = protobuf.FieldDescriptor();
CHAMPIONPROGRESSUPDATEINDICATION = protobuf.Descriptor();
CHAMPIONPROGRESSUPDATEINDICATION_PROGRESS_FIELD = protobuf.FieldDescriptor();
CHAMPIONPROGRESSUPDATEINDICATION_ENDTIME_FIELD = protobuf.FieldDescriptor();
@@ -48,6 +50,7 @@ CHAMPIONGETBETRESPONSE = protobuf.Descriptor();
CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD = protobuf.FieldDescriptor();
CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD = protobuf.FieldDescriptor();
CHAMPIONGETBETRESPONSE_WINUID_FIELD = protobuf.FieldDescriptor();
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD = protobuf.FieldDescriptor();
CHAMPIONBETREQEUST = protobuf.Descriptor();
CHAMPIONBETREQEUST_WINUID_FIELD = protobuf.FieldDescriptor();
CHAMPIONBETREQEUST_COINS_FIELD = protobuf.FieldDescriptor();
@@ -74,6 +77,7 @@ CHAMPIONGETALLMYBETINFORESPONSE = protobuf.Descriptor();
CHAMPIONGETALLMYBETINFORESPONSE_CHAMPIONMYBETDETAILS_FIELD = protobuf.FieldDescriptor();
CHAMPIONVIEWFINALREQUEST = protobuf.Descriptor();
CHAMPIONVIEWFINALREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD = protobuf.FieldDescriptor();
CHAMPIONVIEWFINALRESPONSE = protobuf.Descriptor();
CHAMPIONVIEWFINALRESPONSE_CHAMPIONBATTLEPAIRINFO_FIELD = protobuf.FieldDescriptor();
CHAMPIONGUESSSUCCESSINDICATION = protobuf.Descriptor();
@@ -406,11 +410,31 @@ CHAMPIONGETINFORESPONSE_MYSCORE_FIELD.default_value = 0
CHAMPIONGETINFORESPONSE_MYSCORE_FIELD.type = 5
CHAMPIONGETINFORESPONSE_MYSCORE_FIELD.cpp_type = 1
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.name = "process"
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetInfoResponse.process"
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.number = 8
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.index = 7
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.label = 1
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.has_default_value = false
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.default_value = 0
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.type = 5
+CHAMPIONGETINFORESPONSE_PROCESS_FIELD.cpp_type = 1
+
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.name = "loser"
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetInfoResponse.loser"
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.number = 9
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.index = 8
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.label = 1
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.has_default_value = false
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.default_value = false
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.type = 8
+CHAMPIONGETINFORESPONSE_LOSER_FIELD.cpp_type = 7
+
CHAMPIONGETINFORESPONSE.name = "ChampionGetInfoResponse"
CHAMPIONGETINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.ChampionGetInfoResponse"
CHAMPIONGETINFORESPONSE.nested_types = {}
CHAMPIONGETINFORESPONSE.enum_types = {}
-CHAMPIONGETINFORESPONSE.fields = {CHAMPIONGETINFORESPONSE_JOINSTATE_FIELD, CHAMPIONGETINFORESPONSE_PROGRESS_FIELD, CHAMPIONGETINFORESPONSE_ENDTIME_FIELD, CHAMPIONGETINFORESPONSE_MYRANK_FIELD, CHAMPIONGETINFORESPONSE_MAXRANK_FIELD, CHAMPIONGETINFORESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETINFORESPONSE_MYSCORE_FIELD}
+CHAMPIONGETINFORESPONSE.fields = {CHAMPIONGETINFORESPONSE_JOINSTATE_FIELD, CHAMPIONGETINFORESPONSE_PROGRESS_FIELD, CHAMPIONGETINFORESPONSE_ENDTIME_FIELD, CHAMPIONGETINFORESPONSE_MYRANK_FIELD, CHAMPIONGETINFORESPONSE_MAXRANK_FIELD, CHAMPIONGETINFORESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETINFORESPONSE_MYSCORE_FIELD, CHAMPIONGETINFORESPONSE_PROCESS_FIELD, CHAMPIONGETINFORESPONSE_LOSER_FIELD}
CHAMPIONGETINFORESPONSE.is_extendable = false
CHAMPIONGETINFORESPONSE.extensions = {}
CHAMPIONPROGRESSUPDATEINDICATION_PROGRESS_FIELD.name = "progress"
@@ -489,11 +513,21 @@ CHAMPIONGETBETRESPONSE_WINUID_FIELD.default_value = 0
CHAMPIONGETBETRESPONSE_WINUID_FIELD.type = 5
CHAMPIONGETBETRESPONSE_WINUID_FIELD.cpp_type = 1
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.name = "process"
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse.process"
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.number = 4
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.index = 3
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.label = 1
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.has_default_value = false
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.default_value = 0
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.type = 5
+CHAMPIONGETBETRESPONSE_PROCESS_FIELD.cpp_type = 1
+
CHAMPIONGETBETRESPONSE.name = "ChampionGetBetResponse"
CHAMPIONGETBETRESPONSE.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse"
CHAMPIONGETBETRESPONSE.nested_types = {}
CHAMPIONGETBETRESPONSE.enum_types = {}
-CHAMPIONGETBETRESPONSE.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD}
+CHAMPIONGETBETRESPONSE.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD, CHAMPIONGETBETRESPONSE_PROCESS_FIELD}
CHAMPIONGETBETRESPONSE.is_extendable = false
CHAMPIONGETBETRESPONSE.extensions = {}
CHAMPIONBETREQEUST_WINUID_FIELD.name = "winUid"
@@ -732,11 +766,21 @@ CHAMPIONVIEWFINALREQUEST_TYPE_FIELD.default_value = 0
CHAMPIONVIEWFINALREQUEST_TYPE_FIELD.type = 5
CHAMPIONVIEWFINALREQUEST_TYPE_FIELD.cpp_type = 1
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.name = "page"
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionViewFinalRequest.page"
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.number = 2
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.index = 1
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.label = 1
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.has_default_value = false
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.default_value = 0
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.type = 5
+CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.cpp_type = 1
+
CHAMPIONVIEWFINALREQUEST.name = "ChampionViewFinalRequest"
CHAMPIONVIEWFINALREQUEST.full_name = ".com.ljsd.jieling.protocols.ChampionViewFinalRequest"
CHAMPIONVIEWFINALREQUEST.nested_types = {}
CHAMPIONVIEWFINALREQUEST.enum_types = {}
-CHAMPIONVIEWFINALREQUEST.fields = {CHAMPIONVIEWFINALREQUEST_TYPE_FIELD}
+CHAMPIONVIEWFINALREQUEST.fields = {CHAMPIONVIEWFINALREQUEST_TYPE_FIELD, CHAMPIONVIEWFINALREQUEST_PAGE_FIELD}
CHAMPIONVIEWFINALREQUEST.is_extendable = false
CHAMPIONVIEWFINALREQUEST.extensions = {}
CHAMPIONVIEWFINALRESPONSE_CHAMPIONBATTLEPAIRINFO_FIELD.name = "championBattlePairInfo"
diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
index cc4acbc7a2..079d950948 100644
--- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
@@ -84,6 +84,7 @@ TOWERCOPYINFO_MAPINTORESET_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_TOWERUSETIME_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_TRIALREWARDINFO_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_KILLCOUNT_FIELD = protobuf.FieldDescriptor();
+TOWERCOPYINFO_BOMBUSED_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD = protobuf.FieldDescriptor();
@@ -936,11 +937,21 @@ TOWERCOPYINFO_KILLCOUNT_FIELD.default_value = 0
TOWERCOPYINFO_KILLCOUNT_FIELD.type = 5
TOWERCOPYINFO_KILLCOUNT_FIELD.cpp_type = 1
+TOWERCOPYINFO_BOMBUSED_FIELD.name = "bombUsed"
+TOWERCOPYINFO_BOMBUSED_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.bombUsed"
+TOWERCOPYINFO_BOMBUSED_FIELD.number = 9
+TOWERCOPYINFO_BOMBUSED_FIELD.index = 8
+TOWERCOPYINFO_BOMBUSED_FIELD.label = 1
+TOWERCOPYINFO_BOMBUSED_FIELD.has_default_value = false
+TOWERCOPYINFO_BOMBUSED_FIELD.default_value = 0
+TOWERCOPYINFO_BOMBUSED_FIELD.type = 5
+TOWERCOPYINFO_BOMBUSED_FIELD.cpp_type = 1
+
TOWERCOPYINFO.name = "TowerCopyInfo"
TOWERCOPYINFO.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo"
TOWERCOPYINFO.nested_types = {}
TOWERCOPYINFO.enum_types = {}
-TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD, TOWERCOPYINFO_TRIALREWARDINFO_FIELD, TOWERCOPYINFO_KILLCOUNT_FIELD}
+TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD, TOWERCOPYINFO_TRIALREWARDINFO_FIELD, TOWERCOPYINFO_KILLCOUNT_FIELD, TOWERCOPYINFO_BOMBUSED_FIELD}
TOWERCOPYINFO.is_extendable = false
TOWERCOPYINFO.extensions = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.name = "levelDifficultyInfos"
diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
index c3316ad396..accd7828d7 100644
--- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
@@ -19,6 +19,7 @@ LOGINREQUEST_IP_S_FIELD = protobuf.FieldDescriptor();
LOGINREQUEST_OPENID_FIELD = protobuf.FieldDescriptor();
LOGINREQUEST_CHANNEL_S_FIELD = protobuf.FieldDescriptor();
LOGINREQUEST_PLATFORM_S_FIELD = protobuf.FieldDescriptor();
+LOGINREQUEST_DISTINCT_ID_FIELD = protobuf.FieldDescriptor();
LOGINRESPONSE = protobuf.Descriptor();
LOGINRESPONSE_RESULTCODE_FIELD = protobuf.FieldDescriptor();
LOGINRESPONSE_NEWTOKEN_FIELD = protobuf.FieldDescriptor();
@@ -57,6 +58,8 @@ GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_MONTHINFOS_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
GETITEMINFOREQUEST = protobuf.Descriptor();
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
GETITEMINFORESPONSE = protobuf.Descriptor();
@@ -237,6 +240,8 @@ FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
GETMISSIONRESPONSE = protobuf.Descriptor();
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor();
REFRESHITEMNUMREQUEST = protobuf.Descriptor();
@@ -580,11 +585,21 @@ LOGINREQUEST_PLATFORM_S_FIELD.default_value = ""
LOGINREQUEST_PLATFORM_S_FIELD.type = 9
LOGINREQUEST_PLATFORM_S_FIELD.cpp_type = 9
+LOGINREQUEST_DISTINCT_ID_FIELD.name = "distinct_id"
+LOGINREQUEST_DISTINCT_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.LoginRequest.distinct_id"
+LOGINREQUEST_DISTINCT_ID_FIELD.number = 13
+LOGINREQUEST_DISTINCT_ID_FIELD.index = 12
+LOGINREQUEST_DISTINCT_ID_FIELD.label = 1
+LOGINREQUEST_DISTINCT_ID_FIELD.has_default_value = false
+LOGINREQUEST_DISTINCT_ID_FIELD.default_value = ""
+LOGINREQUEST_DISTINCT_ID_FIELD.type = 9
+LOGINREQUEST_DISTINCT_ID_FIELD.cpp_type = 9
+
LOGINREQUEST.name = "LoginRequest"
LOGINREQUEST.full_name = ".com.ljsd.jieling.protocols.LoginRequest"
LOGINREQUEST.nested_types = {}
LOGINREQUEST.enum_types = {}
-LOGINREQUEST.fields = {LOGINREQUEST_DEVICE_ID_S_FIELD, LOGINREQUEST_IDFA_SOR_IMEI_S_FIELD, LOGINREQUEST_BRAND_TYPE_S_FIELD, LOGINREQUEST_BRAND_S_FIELD, LOGINREQUEST_OS_VERSION_S_FIELD, LOGINREQUEST_DPI_S_FIELD, LOGINREQUEST_OPERATOR_S_FIELD, LOGINREQUEST_NETWORK_S_FIELD, LOGINREQUEST_IP_S_FIELD, LOGINREQUEST_OPENID_FIELD, LOGINREQUEST_CHANNEL_S_FIELD, LOGINREQUEST_PLATFORM_S_FIELD}
+LOGINREQUEST.fields = {LOGINREQUEST_DEVICE_ID_S_FIELD, LOGINREQUEST_IDFA_SOR_IMEI_S_FIELD, LOGINREQUEST_BRAND_TYPE_S_FIELD, LOGINREQUEST_BRAND_S_FIELD, LOGINREQUEST_OS_VERSION_S_FIELD, LOGINREQUEST_DPI_S_FIELD, LOGINREQUEST_OPERATOR_S_FIELD, LOGINREQUEST_NETWORK_S_FIELD, LOGINREQUEST_IP_S_FIELD, LOGINREQUEST_OPENID_FIELD, LOGINREQUEST_CHANNEL_S_FIELD, LOGINREQUEST_PLATFORM_S_FIELD, LOGINREQUEST_DISTINCT_ID_FIELD}
LOGINREQUEST.is_extendable = false
LOGINREQUEST.extensions = {}
LOGINRESPONSE_RESULTCODE_FIELD.name = "resultCode"
@@ -962,11 +977,31 @@ GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.default_value = 0
GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.type = 5
GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.cpp_type = 1
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.name = "hadLuckTime"
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.hadLuckTime"
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.number = 32
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.index = 31
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.label = 1
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.has_default_value = false
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.default_value = 0
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.type = 5
+GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.cpp_type = 1
+
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.name = "hadAdvanceLuckTime"
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.hadAdvanceLuckTime"
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.number = 33
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.index = 32
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.label = 1
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.has_default_value = false
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.default_value = 0
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.type = 5
+GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.cpp_type = 1
+
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.nested_types = {}
GETPLAYERINFORESPONSE.enum_types = {}
-GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD}
+GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD}
GETPLAYERINFORESPONSE.is_extendable = false
GETPLAYERINFORESPONSE.extensions = {}
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
@@ -2610,11 +2645,31 @@ FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.default_value = 0
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.type = 5
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.cpp_type = 1
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.name = "hadLuckTime"
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication.hadLuckTime"
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.number = 14
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.index = 13
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.label = 1
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.has_default_value = false
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.default_value = 0
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.type = 5
+FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.cpp_type = 1
+
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.name = "hadAdvanceLuckTime"
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication.hadAdvanceLuckTime"
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.number = 15
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.index = 14
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.label = 1
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.has_default_value = false
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.default_value = 0
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.type = 5
+FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.cpp_type = 1
+
FIVEPLAYERUPDATEINDICATION.name = "FivePlayerUpdateIndication"
FIVEPLAYERUPDATEINDICATION.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication"
FIVEPLAYERUPDATEINDICATION.nested_types = {}
FIVEPLAYERUPDATEINDICATION.enum_types = {}
-FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD}
+FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD, FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD}
FIVEPLAYERUPDATEINDICATION.is_extendable = false
FIVEPLAYERUPDATEINDICATION.extensions = {}
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.name = "userMissionInfo"
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
new file mode 100644
index 0000000000..7e19feabdc
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
@@ -0,0 +1,17 @@
+XuanYuanMirrorManager = {};
+local this = XuanYuanMirrorManager
+local levelData = {}
+function this.Initialize()
+
+end
+function this.GetMirrorData(_type)
+ local dataList={}
+ local data={}
+ data.state = this.GetState(_type,1)
+ table.insert(data)
+return dataList
+end
+function this.GetState(_type,id)
+return -1
+end
+return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua.meta b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua.meta
new file mode 100644
index 0000000000..c1faa4a6f6
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f99d82714bd958545857e090f3817ee8
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
index c4587385ad..6a50e8941f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
@@ -1,208 +1,117 @@
require("Base/BasePanel")
-CarbonTypePanel = Inherit(BasePanel)
-local this = CarbonTypePanel
+XuanYuanMirrorPanel = Inherit(BasePanel)
+local this = XuanYuanMirrorPanel
local hasFresh = false
local orginLayer = 0
--初始化组件(用于子类重写)
-function CarbonTypePanel:InitComponent()
+function this:InitComponent()
--this.btnBack:SetActive(false)
- this.btnNormal = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/normalRoot") -- 剧情
- this.btnLegend = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/trialRoot") -- 无尽
- this.btnEpic = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/eliteRoot") -- 试炼
- this.btnHero = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/otherRoot") -- 精英
-
- this.newText = {}
+ this.btnYaoling = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/yaolingbaojing") -- 妖灵
+ this.btnRenjie = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/renjiebaojing") -- 人杰
+ this.btnFochan = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/fuochanbaojing") -- 佛禅
+ this.btnDaoxuan = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/daoxuanbaojing") -- 道玄
+ this.btnHelp = Util.GetGameObject(self.gameObject, "btnRoot/btnhelp")
+ this.helpPosition = this.btnHelp:GetComponent("RectTransform").localPosition
+ this.btnRank = Util.GetGameObject(self.gameObject, "btnRoot/btnRank")
+ this.btnReward = Util.GetGameObject(self.gameObject, "btnRoot/btnReward")
+ this.btnClose = Util.GetGameObject(self.gameObject, "btnRoot/btnBack")
+
+ this.remainTimes = Util.GetGameObject(self.gameObject, "remainTimes") :GetComponent("Text")
-- 四个新图标
this.newText = {
- [CARBON_TYPE.NORMAL] = Util.GetGameObject(this.btnNormal, "Image"),
- [CARBON_TYPE.ENDLESS] = Util.GetGameObject(this.btnLegend, "Image"),
- [CARBON_TYPE.TRIAL] = Util.GetGameObject(this.btnEpic, "Image"),
- [CARBON_TYPE.HERO] = Util.GetGameObject(this.btnHero, "Image"),
+ [1] = Util.GetGameObject(this.btnYaoling, "Image"),
+ [2] = Util.GetGameObject(this.btnRenjie, "Image"),
+ [3] = Util.GetGameObject(this.btnFochan, "Image"),
+ [4] = Util.GetGameObject(this.btnDaoxuan, "Image"),
}
- --- 活动开启时间显示
- this.countTime = Util.GetGameObject(self.gameObject, "btnRoot/circle/Image/time"):GetComponent("Text")
- this.timerRoot = Util.GetGameObject(self.gameObject, "btnRoot/circle/Image")
-
this.effect = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect")
this.wind = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect/juneng_chenggong/GameObject")
orginLayer = 0
- --头像、战力
- this.level = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/lvFrame/lv"):GetComponent("Text")
- this.playName = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/name"):GetComponent("Text")
- this.expSliderValue = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/exp"):GetComponent("Slider")
- this.headBox = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox")
- this.headPos = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/headpos")
- this.headRedpot = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/redpot")
- this.teamPower = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/powerBtn/value"):GetComponent("Text")
- this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
-
- -- 特权
- this.vipPrivilegeBtn = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/vipPrivilege/vipPrivilegeBtn")
- this.vipLevelText = Util.GetGameObject(this.vipPrivilegeBtn, "bg/vip"):GetComponent("Image")
- this.vipRedPoint = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/vipPrivilege/redPoint")
- screenAdapte(this.vipPrivilegeBtn)
-
this.AnimRoot = Util.GetGameObject(self.gameObject, "btnRoot/circle/root")
- --日常副本
- this.dailyCarbonBtn=Util.GetGameObject(self.gameObject,"DailyCarbonBtn")
+ BindRedPointObject(RedPointType.Magic_Mirror, Util.GetGameObject(this.btnYaoling, "redPoint"))
+ BindRedPointObject(RedPointType.People_Mirror, Util.GetGameObject(this.btnRenjie, "redPoint"))
+ BindRedPointObject(RedPointType.Buddhist_Mirror, Util.GetGameObject(this.btnFochan, "redPoint"))
+ BindRedPointObject(RedPointType.Taoist_Mirror, Util.GetGameObject(this.btnDaoxuan, "redPoint"))
end
-
local index = 1
--绑定事件(用于子类重写)
-function CarbonTypePanel:BindEvent()
- BindRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
-
- BindRedPointObject(RedPointType.OrdinaryExplore, Util.GetGameObject(this.btnNormal, "redPoint"))
- BindRedPointObject(RedPointType.EpicExplore, Util.GetGameObject(this.btnEpic, "redPoint"))
- BindRedPointObject(RedPointType.HeroExplore, Util.GetGameObject(this.btnHero, "redPoint"))
- BindRedPointObject(RedPointType.LegendExplore, Util.GetGameObject(this.btnLegend, "redPoint"))
-
- -- 普通副本
- Util.AddClick(this.btnNormal, function()
- if ActTimeCtrlManager.SingleFuncState(17) then
- CarbonManager.difficulty = 1
- local jumpCarbonId = CarbonManager.NeedLockId(100, 1)
- UIManager.OpenPanel(UIName.PlotCarbonPanel, jumpCarbonId)
- CheckRedPointStatus(RedPointType.NormalExplore_OpenMap)
- this.RefreshOpenText(CARBON_TYPE.NORMAL, FUNCTION_OPEN_TYPE.NORMALCARBON)
- FunctionOpenMananger.CleadNewText( FUNCTION_OPEN_TYPE.NORMALCARBON)
- else
- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.NORMALCARBON))
- end
+function this:BindEvent()
+ Util.AddClick(this.btnYaoling, function()
+ this:BtnAction(FUNCTION_OPEN_TYPE.MAGIC_MIRROR)
end)
- -- 试炼副本
- Util.AddClick(this.btnEpic, function()
- if ActTimeCtrlManager.SingleFuncState(30) then
- CarbonManager.difficulty = 2
- UIManager.OpenPanel(UIName.TrialCarbonPanel)
- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1)
- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon)
- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL)
- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL)
- else
- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
- end
+ Util.AddClick(this.btnRenjie, function()
+ this:BtnAction(FUNCTION_OPEN_TYPE.PEOPLE_MIRROR)
end)
- -- 英雄副本
- Util.AddClick(this.btnHero, function()
- if ActTimeCtrlManager.SingleFuncState(18) then
- CarbonManager.difficulty = 3
- UIManager.OpenPanel(UIName.EliteCarbonPanel)
- CheckRedPointStatus(RedPointType.HeroExplore_OpenMap)
-
- this.RefreshOpenText(CARBON_TYPE.HERO, FUNCTION_OPEN_TYPE.ELITE)
- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.ELITE)
- else
- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.ELITE))
- end
+ Util.AddClick(this.btnFochan, function()
+ this:BtnAction(FUNCTION_OPEN_TYPE.BUDDHIST_MIRROR)
end)
- -- 无尽副本
- Util.AddClick(this.btnLegend, function()
- this.newText[CARBON_TYPE.ENDLESS]:SetActive(false)
- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.ENDLESS)
-
- if not ActTimeCtrlManager.SingleFuncState(46) then
- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.ENDLESS))
- return
- end
- CarbonManager.difficulty = 4
- UIManager.OpenPanel(UIName.EndLessCarbonPanel)
- this.RefreshOpenText(CARBON_TYPE.ENDLESS, FUNCTION_OPEN_TYPE.ENDLESS)
+ Util.AddClick(this.btnDaoxuan, function()
+ this:BtnAction(FUNCTION_OPEN_TYPE.TAOIST_MIRROR)
end)
-
- --日常副本
- Util.AddClick(this.dailyCarbonBtn,function()
- if ActTimeCtrlManager.SingleFuncState(67)==false then--如果未解锁
- PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN))
- return
- end
- UIManager.OpenPanel(UIName.DailyCarbonPanel)
+ Util.AddClick(this.btnHelp, function()
+ UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.XuanYuanMirror,this.helpPosition.x,this.helpPosition.y)
end)
-
- -- 点击你的猪头
- Util.AddClick(this.headBox, function ()
- UIManager.OpenPanel(UIName.SettingPanel)
+ Util.AddClick(this.btnRank, function()
+
end)
- BindRedPointObject(RedPointType.Setting, this.headRedpot)
-
- Util.AddClick(this.vipPrivilegeBtn, function()
- UIManager.OpenPanel(UIName.VipPanelV2)
+ Util.AddClick(this.btnReward, function()
+
end)
+ Util.AddClick(this.btnClose, function()
+ this:OnClose()
+ end)
+end
+function this:BtnAction(_type)
+ if ActTimeCtrlManager.SingleFuncState(_type) then
+ UIManager.OpenPanel(UIName.HelpPopup,_type,XuanYuanMirrorManager.GetMirrorData(_type))
+ else
+ PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(_type))
+ end
end
--添加事件监听(用于子类重写)
-function CarbonTypePanel:AddListener()
+function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.FreshIconShow)
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.FreshIconShow)
-
end
--移除事件监听(用于子类重写)
-function CarbonTypePanel:RemoveListener()
+function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.FreshIconShow)
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.FreshIconShow)
end
-function CarbonTypePanel:OnOpen()
- -- 清除一下选得副本类型
- CarbonManager.difficulty = 0
- CheckRedPointStatus(RedPointType.EpicExplore_GetReward)
- this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.Carbon })
+function this:OnOpen()
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
end
--界面打开时调用(用于子类重写)
-function CarbonTypePanel:OnShow(...)
- Util.SetGray(this.btnNormal, not ActTimeCtrlManager.SingleFuncState(17))
- Util.SetGray(this.btnEpic, not ActTimeCtrlManager.SingleFuncState(30))
- Util.SetGray(this.btnHero, not ActTimeCtrlManager.SingleFuncState(18))
- Util.SetGray(this.btnLegend, not ActTimeCtrlManager.SingleFuncState(46))
- Util.SetGray(this.dailyCarbonBtn,not ActTimeCtrlManager.SingleFuncState(67))
+function this:OnShow(...)
+ Util.SetGray(this.btnYaoling, not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MAGIC_MIRROR))
+ Util.SetGray(this.btnHero, not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.PEOPLE_MIRROR))
+ Util.SetGray(this.btnFochan, not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.BUDDHIST_MIRROR))
+ Util.SetGray(this.btnLegend, not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TAOIST_MIRROR))
+
+ this.remainTimes = "今日剩余次数:"..5
-- 音效
SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
-- 播放动画
- CarbonTypePanel:PlayAni()
- CarbonManager.GetMissionLevelData()
+ this:PlayAni()
- this.FreshPlayerInfo()
- this.SetPlayerHead()
this.SetOpenText()
this.PlayScaleAnim()
-
-
-end
-
--- 刷新玩家信息显示
-function this.FreshPlayerInfo()
- this.vipLevelText.sprite = VipManager.SetVipLevelImg()
- this.level.text = PlayerManager.level
- this.expSliderValue.value = PlayerManager.exp / PlayerManager.userLevelData[PlayerManager.level].Exp
- this.playName.text = PlayerManager.nickName
- this.teamPower.text = FormationManager.GetFormationPower(FormationManager.curFormationIndex)
-end
-
--- 设置头像
-function this.SetPlayerHead()
- if not this.playerHead then
- this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
- end
- this.playerHead:SetHead(PlayerManager.head)
- this.playerHead:SetFrame(PlayerManager.frame)
- this.playerHead:SetScale(Vector3.one * 0.9)
- this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
-
end
--- 设置时候显示新字
@@ -231,7 +140,7 @@ function this:OnSortingOrderChange()
end
-function CarbonTypePanel:PlayAni()
+function this:PlayAni()
-- 玩家没有资格开启
this.timerRoot:SetActive(false)
@@ -268,43 +177,11 @@ end
-- 选择类型
function this.ChooseCarbonType(type)
- CarbonManager.difficulty = type
+
end
function this.StartCountTime()
- this.countTime.text = ""
- if this.timer then
- this.timer:Stop()
- this.timer = nil
- end
-
- local freshTime = 0
- local isOpen = false
- local str = ""
- local serData = ActTimeCtrlManager.GetSerDataByTypeId(46)
- if not ActTimeCtrlManager.FuncTimeJudge(46) then
- freshTime = serData.startTime
- isOpen = false
- str = Language[10325]
- else
- freshTime = serData.endTime
- isOpen = true
- str = Language[10326]
- end
-
- hasFresh = false
-
- if not this.timer then
- this.timer = Timer.New(function()
- if not this.timer or not this.countTime then
- return
- end
-
- this.countTime.text = str .. FormatSecond(freshTime - PlayerManager.serverTime)
- end, 1, -1, true)
- this.timer:Start()
- end
-
+
end
function this.FreshIconShow(id)
@@ -318,48 +195,32 @@ function this.FreshIconShow(id)
end, 1)
this.refreshTimer:Start()
end
-
end
--界面关闭时调用(用于子类重写)
-function CarbonTypePanel:OnClose()
- if this.timer then
- this.timer:Stop()
- this.timer = nil
- end
-
- if this.refreshTimer then
- this.refreshTimer:Stop()
- this.refreshTimer = nil
- end
+function this:OnClose()
this.isPlayDoorAudio = false
end
function this.SetOpenText()
- this.newText[CARBON_TYPE.NORMAL]:SetActive(FunctionOpenMananger.GetModuleOpen(17))
- this.newText[CARBON_TYPE.ENDLESS]:SetActive(FunctionOpenMananger.GetModuleOpen(46))
- this.newText[CARBON_TYPE.TRIAL]:SetActive(FunctionOpenMananger.GetModuleOpen(30))
- this.newText[CARBON_TYPE.HERO]:SetActive(FunctionOpenMananger.GetModuleOpen(18))
+ this.newText[1]:SetActive(FunctionOpenMananger.GetModuleOpen(FUNCTION_OPEN_TYPE.MAGIC_MIRROR))
+ this.newText[2]:SetActive(FunctionOpenMananger.GetModuleOpen(FUNCTION_OPEN_TYPE.PEOPLE_MIRROR))
+ this.newText[3]:SetActive(FunctionOpenMananger.GetModuleOpen(FUNCTION_OPEN_TYPE.BUDDHIST_MIRROR))
+ this.newText[4]:SetActive(FunctionOpenMananger.GetModuleOpen(FUNCTION_OPEN_TYPE.TAOIST_MIRROR))
end
-- 刷新显示
function this.RefreshOpenText(carbonType, openId)
this.newText[carbonType]:SetActive(FunctionOpenMananger.GetModuleOpen(openId))
- --this.BtView:InitNewOpenShow()
end
--界面销毁时调用(用于子类重写)
-function CarbonTypePanel:OnDestroy()
- ClearRedPointObject(RedPointType.OrdinaryExplore)
- ClearRedPointObject(RedPointType.HeroExplore)
- ClearRedPointObject(RedPointType.EpicExplore)
- ClearRedPointObject(RedPointType.LegendExplore)
- ClearRedPointObject(RedPointType.Setting, this.headRedpot)
- ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
-
- hasFresh = false
- SubUIManager.Close(this.BtView)
+function this:OnDestroy()
+ ClearRedPointObject(RedPointType.Magic_Mirror)
+ ClearRedPointObject(RedPointType.People_Mirror)
+ ClearRedPointObject(RedPointType.Buddhist_Mirror)
+ ClearRedPointObject(RedPointType.Taoist_Mirror)
SubUIManager.Close(this.UpView)
end
-return CarbonTypePanel
\ No newline at end of file
+return XuanYuanMirrorPanel
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
index 3f75bb75a0..f11b2200bf 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
@@ -1,396 +1,154 @@
require("Base/BasePanel")
-CarbonTypePanelV2 = Inherit(BasePanel)
-local this = CarbonTypePanelV2
+XuanYuanMirrorPanelList = Inherit(BasePanel)
+local this = XuanYuanMirrorPanelList
local hasFresh = false
local orginLayer = 0
+
+local mirrors = {}
+local curType = 0
+local dataList = {}
+local list = {}
+local colorText = {
+ sprite = { [-1] = "s_slbz_1anniuhuise",[0] = "s_slbz_1anniuongse",[1] = "s_slbz_1anniuhuangse"},
+ color = { [-1] = "3B3B3B",[0] = "855139",[1] = "8B670C"},
+ text = { [-1] = "未开启",[0] = "挑战",[1] = "扫荡" }
+}
+local difficult = {
+ text = {"简单","普通","困难","噩梦"},
+ sprite = {"x_xb_tiao_05","x_xb_tiao_04","x_xb_tiao_03","x_xb_tiao_02","x_xb_tiao_01"},
+}
+
--初始化组件(用于子类重写)
-function CarbonTypePanelV2:InitComponent()
- this.btnNormal = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/normalRoot") -- 剧情
- this.btnLegend = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/trialRoot") -- 无尽
- this.btnEpic = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/eliteRoot") -- 试炼
- this.btnHero = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/otherRoot") -- 精英
- --日常副本
- this.dailyCarbonBtn=Util.GetGameObject(self.gameObject,"DailyCarbonBtn")
-
- -- for i = 2, 4 do
- -- Util.SetGray(Util.GetGameObject(self.gameObject,"BgRoot/"..i),true)
- -- end
-
- -- this.newText = {}
-
- -- -- 四个新图标
- -- this.newText = {
- -- [CARBON_TYPE.NORMAL] = Util.GetGameObject(this.btnNormal, "Image"),
- -- [CARBON_TYPE.ENDLESS] = Util.GetGameObject(this.btnLegend, "Image"),
- -- [CARBON_TYPE.TRIAL] = Util.GetGameObject(this.btnEpic, "Image"),
- -- [CARBON_TYPE.HERO] = Util.GetGameObject(this.btnHero, "Image"),
- -- }
-
-
- --- 活动开启时间显示
- -- this.countTime = Util.GetGameObject(self.gameObject, "btnRoot/circle/Image/time"):GetComponent("Text")
- -- this.timerRoot = Util.GetGameObject(self.gameObject, "btnRoot/circle/Image")
-
- this.effect = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect")
- this.wind = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect/juneng_chenggong/GameObject")
-
- orginLayer = 0
-
- --头像、战力
- this.level = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/lvFrame/lv"):GetComponent("Text")
- this.playName = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/name"):GetComponent("Text")
- this.expSliderValue = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/exp"):GetComponent("Slider")
- this.headBox = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox")
- this.headPos = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/headpos")
- this.headRedpot = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/headBox/redpot")
- this.teamPower = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/powerBtn/value"):GetComponent("Text")
- this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
+function this:InitComponent()
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
+ mirrors[FUNCTION_OPEN_TYPE.MAGIC_MIRROR] = Util.GetGameObject(self.gameObject,"yaoling")
+ mirrors[FUNCTION_OPEN_TYPE.PEOPLE_MIRROR] = Util.GetGameObject(self.gameObject,"renjie")
+ mirrors[FUNCTION_OPEN_TYPE.BUDDHIST_MIRROR] = Util.GetGameObject(self.gameObject,"fuochan")
+ mirrors[FUNCTION_OPEN_TYPE.TAOIST_MIRROR] = Util.GetGameObject(self.gameObject,"daoxuan")
+
+ this.remainTimesTip = Util.GetGameObject(self.gameObject,"Panel/remainTimesTip") : GetGameObject("Text")
+ this.btnBack = Util.GetGameObject(self.gameObject,"Panel/BackBtn") : GetGameObject("Text")
+
+ this.levelPre = Util.GetGameObject(self.gameObject,"Panel/Scroll/Pre")
+ local v21 = Util.GetGameObject(self.gameObject, "Panel/Scroll"):GetComponent("RectTransform").rect
+ this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "Scroll").transform,
+ this.levelPre, Vector2.New(-v21.x*2, -v21.y*2), 1, 1, Vector2.New(0,15))
+ this.ScrollView.moveTween.MomentumAmount = 1
+ this.ScrollView.moveTween.Strength = 1
- -- 特权
- this.vipPrivilegeBtn = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/vipPrivilege/vipPrivilegeBtn")
- this.vipLevelText = Util.GetGameObject(this.vipPrivilegeBtn, "bg/vip"):GetComponent("Image")
- this.vipRedPoint = Util.GetGameObject(self.gameObject, "BgRoot/LeftUp/vipPrivilege/redPoint")
- screenAdapte(this.vipPrivilegeBtn)
- this.AnimRoot = Util.GetGameObject(self.gameObject, "btnRoot/circle/root")
end
-
-local index = 1
--绑定事件(用于子类重写)
-function CarbonTypePanelV2:BindEvent()
- BindRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
-
- -- BindRedPointObject(RedPointType.OrdinaryExplore, Util.GetGameObject(this.btnNormal, "redPoint"))
- -- BindRedPointObject(RedPointType.EpicExplore, Util.GetGameObject(this.btnEpic, "redPoint"))
- -- BindRedPointObject(RedPointType.HeroExplore, Util.GetGameObject(this.btnHero, "redPoint"))
- -- BindRedPointObject(RedPointType.LegendExplore, Util.GetGameObject(this.btnLegend, "redPoint"))
-
- -- 剧情副本(现改为猎妖之路)
- Util.AddClick(this.btnNormal, function()
- -- if ActTimeCtrlManager.SingleFuncState(17) then
- -- CarbonManager.difficulty = 1
- -- local jumpCarbonId = CarbonManager.NeedLockId(100, 1)
- -- UIManager.OpenPanel(UIName.PlotCarbonPanel, jumpCarbonId)
- -- CheckRedPointStatus(RedPointType.NormalExplore_OpenMap)
- -- this.RefreshOpenText(CARBON_TYPE.NORMAL, FUNCTION_OPEN_TYPE.NORMALCARBON)
- -- FunctionOpenMananger.CleadNewText( FUNCTION_OPEN_TYPE.NORMALCARBON)
- -- else
- -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.NORMALCARBON))
- -- end
- if ActTimeCtrlManager.SingleFuncState(JumpType.Expedition) then
- if #ExpeditionManager.nodeInfo <= 0 then
- if ExpeditionManager.expeditionLeve == -1 then
- NetManager.GetExpeditionRequest(2,function()
- JumpManager.GoJump(64001)
- end)
- else
- NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,function()
- JumpManager.GoJump(64001)
- end)
- end
- else
- JumpManager.GoJump(64001)
- end
- else
- if ExpeditionManager.ExpeditionState == 2 then
- PopupTipPanel.ShowTip(Language[12195])
- else
- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
- end
- end
- end)
-
- -- 试炼副本(暂时改为心魔试练。原锁妖塔;兽潮来袭)
- Util.AddClick(this.btnEpic, function()
- JumpManager.GoJump(1011)
- -- if ActTimeCtrlManager.SingleFuncState(30) then
- -- CarbonManager.difficulty = 2
- -- UIManager.OpenPanel(UIName.TrialCarbonPanel)
- -- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1)
- -- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon)
- -- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL)
- -- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL)
- -- else
- -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
- -- end
- end)
-
- -- 英雄副本
- Util.AddClick(this.btnHero, function()
- if ActTimeCtrlManager.SingleFuncState(18) then
- CarbonManager.difficulty = 3
- UIManager.OpenPanel(UIName.EliteCarbonPanel)
- CheckRedPointStatus(RedPointType.HeroExplore_OpenMap)
-
- this.RefreshOpenText(CARBON_TYPE.HERO, FUNCTION_OPEN_TYPE.ELITE)
- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.ELITE)
- else
- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.ELITE))
- end
- end)
-
-
- -- 无尽副本(暂时改为车迟斗法)
- Util.AddClick(this.btnLegend, function()
- if PlayerManager.familyId == 0 then
- PopupTipPanel.ShowTip(Language[10327])
- return
- end
- UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
- -- this.newText[CARBON_TYPE.ENDLESS]:SetActive(false)
- -- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.ENDLESS)
-
- -- if not ActTimeCtrlManager.SingleFuncState(46) then
- -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.ENDLESS))
- -- return
- -- end
- -- CarbonManager.difficulty = 4
- -- UIManager.OpenPanel(UIName.EndLessCarbonPanel)
- -- this.RefreshOpenText(CARBON_TYPE.ENDLESS, FUNCTION_OPEN_TYPE.ENDLESS)
- end)
-
- --日常副本
- Util.AddClick(this.dailyCarbonBtn,function()
- if ActTimeCtrlManager.SingleFuncState(67)==false then--如果未解锁
- PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN))
- return
- end
- UIManager.OpenPanel(UIName.DailyCarbonPanel)
- end)
-
- -- 点击你的猪头
- Util.AddClick(this.headBox, function ()
- UIManager.OpenPanel(UIName.SettingPanel)
- end)
- BindRedPointObject(RedPointType.Setting, this.headRedpot)
-
- Util.AddClick(this.vipPrivilegeBtn, function()
- UIManager.OpenPanel(UIName.VipPanelV2)
- end)
+function this:BindEvent()
+
end
--添加事件监听(用于子类重写)
-function CarbonTypePanelV2:AddListener()
- -- Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.FreshIconShow)--原无尽5点刷新相关 暂时不用了
- -- Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.FreshIconShow)
-
+function this:AddListener()
+
end
--移除事件监听(用于子类重写)
-function CarbonTypePanelV2:RemoveListener()
- -- Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.FreshIconShow)
- -- Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.FreshIconShow)
+function this:RemoveListener()
+
end
-function CarbonTypePanelV2:OnOpen()
- -- 清除一下选得副本类型
- CarbonManager.difficulty = 0
- CheckRedPointStatus(RedPointType.EpicExplore_GetReward)
- this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.Carbon })
+function this:OnOpen(_type,_data)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
+ curType = _type
+ dataList = _data
+end
+
+function this:SwitchView()
+ local curObj
+ for k,v in pairs(mirrors) do
+ if curType == k then
+ v.gameObject:SetActive(true)
+ curObj = v
+ else
+ v.gameObject:SetActive(false)
+ end
+ end
+ if curObj then
+ Util.GetGameObject(curObj,"Text"):GetComponent("Text").text = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力"
+ end
+ this.ScrollView:SetData(dataList, function (index, go)
+ this:SetLevelData(go, dataList[index])
+ table.insert(list,go)
+ end)
+end
+
+function this:SetLevelData(go, data)
+ local btnFight = Util.GetGameObject(go,"btnFight")
+ btnFight:GetGameObject("Image").sprite = Util.LoadSprite(colorText.sprite[data.state])
+ local text = Util.GetGameObject(btnFight,"Text"):GetGameObject("Text")
+ text.color = colorText.color[data.state]
+ text.text = colorText.text[data.state]
+ local tip = Util.GetGameObject(btnFight,"Tip"):GetGameObject("Text")
+ if data.state == -1 then
+ tip.gameObject:SetActive(false)
+ elseif data.state == 0 then
+ tip.text=data.condition
+ else
+ tip.text="已通过"
+ end
+ Util.AddOnceClick(btnFight:GetGameObject("Button"),function() end)
+ local rewardGrid = Util.GetGameObject(go,"Reward")
+ local rewards = {}
+ for n,m in ipairs(data.rewards) do
+ if m then
+ if not rewards[n] then
+ rewards[n] = SubUIManager.Open(SubUIConfig.ItemView,rewardGrid.transform)
+ end
+ rewards[n]:OnOpen(false, {m.id, m.num}, 1.6, false)
+ if m.isFirst or m.israte then
+ local image = Util.GetGameObject(rewards[n],"PreciousShow")
+ image.gameObject:SetActive(true)
+ Util.GetGameObject(rewards[n],"PreciousShow/Text").gameObject:SetActive(false)
+ if m.isFirst then
+ image:GetComponent("Image").sprite = Util.LoadSprite("x_xianyuan_shoucijiaobiao")
+ end
+ if m.israte then
+ image:GetComponent("Image").sprite = Util.LoadSprite("x_xianyuan_gailvjiaobiao")
+ end
+ end
+ end
+ end
+ Util.GetGameObject(btnFight,"Bg/BgQuality/title"):GetGameObject("Text").text = data.title
+ Util.GetGameObject(btnFight,"Bg/BgQuality/difficult"):GetGameObject("Text").text = difficult.text[data.difficult]
+ Util.GetGameObject(btnFight,"Bg/BgQuality"):GetGameObject("Image").sprite = difficult.sprite[data.difficult]
+ Util.GetGameObject(btnFight,"Bg/BgQuality/Text"):GetGameObject("Text").text = data.power
end
--界面打开时调用(用于子类重写)
-function CarbonTypePanelV2:OnShow(...)
- Util.SetGray(this.btnNormal, not ActTimeCtrlManager.SingleFuncState(17))
- Util.SetGray(this.btnEpic, not ActTimeCtrlManager.SingleFuncState(30))
- Util.SetGray(this.btnHero, not ActTimeCtrlManager.SingleFuncState(18))
- Util.SetGray(this.btnLegend, not ActTimeCtrlManager.SingleFuncState(46))
- Util.SetGray(this.dailyCarbonBtn,not ActTimeCtrlManager.SingleFuncState(67))
- -- 音效
- SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
- -- 播放动画
-
- -- CarbonTypePanelV2:PlayAni()
- CarbonManager.GetMissionLevelData()
-
- this.FreshPlayerInfo()
- this.SetPlayerHead()
- this.SetOpenText()
- this.PlayScaleAnim()
-
-
-end
-
--- 刷新玩家信息显示
-function this.FreshPlayerInfo()
- this.vipLevelText.sprite = VipManager.SetVipLevelImg()
- this.level.text = PlayerManager.level
- this.expSliderValue.value = PlayerManager.exp / PlayerManager.userLevelData[PlayerManager.level].Exp
- this.playName.text = PlayerManager.nickName
- this.teamPower.text = FormationManager.GetFormationPower(FormationManager.curFormationIndex)
-end
-
--- 设置头像
-function this.SetPlayerHead()
- if not this.playerHead then
- this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
- end
- this.playerHead:SetHead(PlayerManager.head)
- this.playerHead:SetFrame(PlayerManager.frame)
- this.playerHead:SetScale(Vector3.one * 0.9)
- this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
-
-end
-
---- 设置时候显示新字
-----@param btnCarbon 副本类型按钮
-function this.SetNewTextShow(btnCarbon, state)
- -- for i, v in pairs(this.newText) do
- -- if i == carbonType then
- -- v:SetActive(state)
- -- end
- -- end
-
- if btnCarbon then
- local textGo = Util.GetGameObject(btnCarbon.transform, "Image")
- if textGo then
- textGo:SetActive(state)
- end
- end
+function this:OnShow(...)
+ this.remainTimesTip = "剩余时间:5天23小时(激活特权可增加次数)"
+ this:SwitchView()
end
function this:OnSortingOrderChange()
- Util.AddParticleSortLayer(this.effect, self.sortingOrder - orginLayer)
- Util.AddParticleSortLayer(this.wind, self.sortingOrder - orginLayer)
- Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - orginLayer)
-
- orginLayer = self.sortingOrder
-
- this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
+
end
-
-function CarbonTypePanelV2:PlayAni()
-
- -- 玩家没有资格开启
- -- this.timerRoot:SetActive(false)
- -- if not ActTimeCtrlManager.IsQualifiled(46) then
- -- return
- -- end
-
- -- 启动定时器
- -- this.StartCountTime()
-
- -- 开门音效
- if not this.isPlayDoorAudio then
- this.isPlayDoorAudio = true
- Timer.New(function ()
- if this.isPlayDoorAudio then
- SoundManager.PlaySound(SoundConfig.Sound_Door)
- end
- end, 1.3):Start()
- end
- -- 动画播放完才显示时间
- -- Timer.New(function ()
- -- this.timerRoot:SetActive(true)
- -- end, 2.5):Start()
-end
-
-function this.PlayScaleAnim()
- local isOpen = FunctionOpenMananger.GetRootState(PanelTypeView.Carbon)
- if isOpen then
- PlayUIAnim(this.AnimRoot)
- else
- PlayUIAnimBack(this.AnimRoot)
- end
-end
-
--- 选择类型
-function this.ChooseCarbonType(type)
- CarbonManager.difficulty = type
-end
-
--- function this.StartCountTime()
- -- this.countTime.text = ""
- -- if this.timer then
- -- this.timer:Stop()
- -- this.timer = nil
- -- end
-
- -- local freshTime = 0
- -- local isOpen = false
- -- local str = ""
- -- local serData = ActTimeCtrlManager.GetSerDataByTypeId(46)
- -- if not ActTimeCtrlManager.FuncTimeJudge(46) then
- -- freshTime = serData.startTime
- -- isOpen = false
- -- str = "距离开启"
- -- else
- -- freshTime = serData.endTime
- -- isOpen = true
- -- str = "距离结束"
- -- end
-
- -- hasFresh = false
-
- -- if not this.timer then
- -- this.timer = Timer.New(function()
- -- if not this.timer or not this.countTime then
- -- return
- -- end
-
- -- this.countTime.text = str .. FormatSecond(freshTime - PlayerManager.serverTime)
- -- end, 1, -1, true)
- -- this.timer:Start()
- -- end
-
--- end
-
--- function this.FreshIconShow(id)
--- if not hasFresh then
--- hasFresh = true
-
--- this.refreshTimer = nil
--- this.refreshTimer = Timer.New(function ()
--- Util.SetGray(this.btnLegend, not ActTimeCtrlManager.SingleFuncState(46))
--- this.StartCountTime()
--- end, 1)
--- this.refreshTimer:Start()
--- end
--- end
-
--界面关闭时调用(用于子类重写)
-function CarbonTypePanelV2:OnClose()
- if this.timer then
- this.timer:Stop()
- this.timer = nil
- end
-
- if this.refreshTimer then
- this.refreshTimer:Stop()
- this.refreshTimer = nil
- end
- this.isPlayDoorAudio = false
+function this:OnClose()
+
end
function this.SetOpenText()
--- this.newText[CARBON_TYPE.NORMAL]:SetActive(FunctionOpenMananger.GetModuleOpen(17))
--- this.newText[CARBON_TYPE.ENDLESS]:SetActive(FunctionOpenMananger.GetModuleOpen(46))
--- this.newText[CARBON_TYPE.TRIAL]:SetActive(FunctionOpenMananger.GetModuleOpen(30))
--- this.newText[CARBON_TYPE.HERO]:SetActive(FunctionOpenMananger.GetModuleOpen(18))
+
end
-- 刷新显示
function this.RefreshOpenText(carbonType, openId)
- -- this.newText[carbonType]:SetActive(FunctionOpenMananger.GetModuleOpen(openId))
- this.BtView:InitNewOpenShow()
+
end
--界面销毁时调用(用于子类重写)
-function CarbonTypePanelV2:OnDestroy()
- -- ClearRedPointObject(RedPointType.OrdinaryExplore)
- -- ClearRedPointObject(RedPointType.HeroExplore)
- -- ClearRedPointObject(RedPointType.EpicExplore)
- -- ClearRedPointObject(RedPointType.LegendExplore)
- -- ClearRedPointObject(RedPointType.Setting, this.headRedpot)
- -- ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
-
- hasFresh = false
- SubUIManager.Close(this.BtView)
+function this:OnDestroy()
SubUIManager.Close(this.UpView)
+ this.ScrollView = nil
end
-return CarbonTypePanelV2
\ No newline at end of file
+return XuanYuanMirrorPanelList
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua
index 47aa4195ed..8b9f93a33e 100644
--- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua
@@ -38,6 +38,17 @@ local TreasureType={
Advanced=31,
}
+this.luckyTimes = 0
+this.advanceTimes = 0
+function this.SetTimes(_luckyTimes,_advanceTimes)
+ if _luckyTimes then
+ this.luckyTimes = _luckyTimes
+ end
+ if _advanceTimes then
+ this.advanceTimes = _advanceTimes
+ end
+end
+
function this.Initialize()
--世界跑马灯数据存储
this.worldMessageData={}
diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
index 82eb1501b2..0059f20146 100644
--- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
@@ -246,12 +246,7 @@ function this.SwitchTreasureType(treasureType)
this.ClearDefault()
if treasureType==TreasureType.Lucky then
LuckyTurnTableManager.curTreasureType=treasureType
-
- if not PlayerPrefs.HasKey("treasure" .. treasureType) then
- PlayerPrefs.SetInt("treasure" .. treasureType, 0)
- end
- local tempnum = PlayerPrefs.GetInt("treasure" .. treasureType)
- this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
+ this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount)
this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LuckyTreasure })
this.bg1.sprite=Util.LoadSprite(BgName[1])
@@ -288,20 +283,18 @@ function this.SwitchTreasureType(treasureType)
--探宝1次按钮
Util.AddOnceClick(this.treasureOnceBtn, function()
if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0
- and tempnum + 1 <= maxTimesCount then
+ and LuckyTurnTableManager.luckyTimes + 1 <= maxTimesCount then
LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,false,function()
- tempnum = tempnum + 1
- PlayerPrefs.SetInt("treasure" .. treasureType, tempnum)
- this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
--Log("==YSP== 幸运探宝返回的是什么"..tostring(LuckyTurnTableManager.luckyTempData.posInfos))
this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos)
this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示
this.RrFreshInfo()
-
+ LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 1)
+ this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount)
end)
else
--PopupTipPanel.ShowTip("幸运探宝券不足!")
- if tempnum + 1 > maxTimesCount then
+ if LuckyTurnTableManager.luckyTimes + 1 > maxTimesCount then
PopupTipPanel.ShowTip("不可超出最大探宝次数!")
return
else
@@ -312,19 +305,18 @@ function this.SwitchTreasureType(treasureType)
--探宝10次按钮
Util.AddOnceClick(this.treasureMultipleBtn, function()
if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0
- and tempnum + 15 <= maxTimesCount then
+ and LuckyTurnTableManager.luckyTimes + 15 <= maxTimesCount then
LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,true,function()
- tempnum = tempnum + 15
- PlayerPrefs.SetInt("treasure" .. treasureType, tempnum)
- this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
--Log("==YSP== 幸运探宝返回的是什么"..tostring(LuckyTurnTableManager.luckyTempData))
this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos)
this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示
this.RrFreshInfo()
+ LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 15)
+ this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount)
end)
else
--PopupTipPanel.ShowTip("幸运探宝券不足!")
- if tempnum + 15 > maxTimesCount then
+ if LuckyTurnTableManager.luckyTimes + 15 > maxTimesCount then
PopupTipPanel.ShowTip("不可超出最大探宝次数!")
return
else
@@ -365,11 +357,7 @@ function this.SwitchTreasureType(treasureType)
elseif treasureType==TreasureType.Advanced then
LuckyTurnTableManager.curTreasureType=treasureType
- if not PlayerPrefs.HasKey("treasure" .. treasureType) then
- PlayerPrefs.SetInt("treasure" .. treasureType, 0)
- end
- local tempnum = PlayerPrefs.GetInt("treasure" .. treasureType)
- this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
+ this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount)
this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.AdvancedTreasure })
this.bg1.sprite=Util.LoadSprite(BgName[3])
@@ -407,11 +395,10 @@ function this.SwitchTreasureType(treasureType)
--探宝1次按钮
Util.AddOnceClick(this.treasureOnceBtn, function()
if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0
- and tempnum + 1 <= maxTimesCount then
+ and LuckyTurnTableManager.advanceTimes + 1 <= maxTimesCount then
LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,false,function()
- tempnum = tempnum + 1
- PlayerPrefs.SetInt("treasure" .. treasureType, tempnum)
- this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
+ LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 1)
+ this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount)
--Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData))
this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos)
this.SetPropShow(61,TreasureType.Advanced)
@@ -419,7 +406,7 @@ function this.SwitchTreasureType(treasureType)
end)
else
--PopupTipPanel.ShowTip("高级探宝券不足!")
- if tempnum + 1 > maxTimesCount then
+ if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then
PopupTipPanel.ShowTip("不可超出最大探宝次数!")
return
else
@@ -430,11 +417,10 @@ function this.SwitchTreasureType(treasureType)
--探宝10次按钮
Util.AddOnceClick(this.treasureMultipleBtn, function()
if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0
- and tempnum + 10 <= maxTimesCount then
+ and LuckyTurnTableManager.advanceTimes + 10 <= maxTimesCount then
LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,true,function()
- tempnum = tempnum + 10
- PlayerPrefs.SetInt("treasure" .. treasureType, tempnum)
- this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
+ LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 10)
+ this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount)
--Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData))
this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos)
this.SetPropShow(61,TreasureType.Advanced)
@@ -442,7 +428,7 @@ function this.SwitchTreasureType(treasureType)
end)
else
--PopupTipPanel.ShowTip("高级探宝券不足!")
- if tempnum + 10 > maxTimesCount then
+ if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then
PopupTipPanel.ShowTip("不可超出最大探宝次数!")
return
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
index 58b6f83d18..258cb87309 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
@@ -152,6 +152,7 @@ function this.RefreshUpdateIndication(buffer)
CheckRedPointStatus(RedPointType.SecretTer_HaveFreeTime)
CheckRedPointStatus(RedPointType.DailyGift)
CheckRedPointStatus(RedPointType.GrowthPackage)
+ LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
end
--服务器推送红点信息
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 63e78ff061..f7a520f1a6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -185,7 +185,7 @@ function this.PlayerInfoRequest(func)
for _, type in ipairs(msg.playedMapTypes) do
Log(Language[11425]..type)
end
-
+ LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
if func then
func(msg)
end