diff --git a/Assets/LuaFramework/GameIcon/icon_xipu.png b/Assets/LuaFramework/GameIcon/icon_xipu.png
new file mode 100644
index 0000000000..3f655a9cb8
Binary files /dev/null and b/Assets/LuaFramework/GameIcon/icon_xipu.png differ
diff --git a/Assets/LuaFramework/GameIcon/icon_xipu.png.meta b/Assets/LuaFramework/GameIcon/icon_xipu.png.meta
new file mode 100644
index 0000000000..862576189c
--- /dev/null
+++ b/Assets/LuaFramework/GameIcon/icon_xipu.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 120aef7736d81434485dc4b19ee1bc9a
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 7c538ffef13c08c4481b90dce394b477
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/LuaFramework/Scenes/Logo_cn_xipu.unity b/Assets/LuaFramework/Scenes/Logo_cn_xipu.unity
new file mode 100644
index 0000000000..7064301729
--- /dev/null
+++ b/Assets/LuaFramework/Scenes/Logo_cn_xipu.unity
@@ -0,0 +1,362 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_OcclusionBakeSettings:
+ smallestOccluder: 5
+ smallestHole: 0.25
+ backfaceThreshold: 100
+ m_SceneGUID: 00000000000000000000000000000000
+ m_OcclusionCullingData: {fileID: 0}
+--- !u!1 &2
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 16}
+ - component: {fileID: 42}
+ - component: {fileID: 44}
+ - component: {fileID: 43}
+ - component: {fileID: 5}
+ - component: {fileID: 3}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &3
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!196 &4
+NavMeshSettings:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_BuildSettings:
+ serializedVersion: 2
+ agentTypeID: 0
+ agentRadius: 0.5
+ agentHeight: 2
+ agentSlope: 45
+ agentClimb: 0.4
+ ledgeDropHeight: 0
+ maxJumpAcrossDistance: 0
+ minRegionArea: 2
+ manualCellSize: 0
+ cellSize: 0.16666667
+ manualTileSize: 0
+ tileSize: 256
+ accuratePlacement: 0
+ debug:
+ m_Flags: 0
+ m_NavMeshData: {fileID: 0}
+--- !u!81 &5
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2}
+ m_Enabled: 1
+--- !u!4 &16
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2}
+ 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: 0}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!104 &22
+RenderSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 9
+ m_Fog: 0
+ m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ m_FogMode: 3
+ m_FogDensity: 0.01
+ m_LinearFogStart: 0
+ m_LinearFogEnd: 300
+ m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+ m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+ m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+ m_AmbientIntensity: 1
+ m_AmbientMode: 3
+ m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+ m_SkyboxMaterial: {fileID: 0}
+ m_HaloStrength: 0.5
+ m_FlareStrength: 1
+ m_FlareFadeSpeed: 3
+ m_HaloTexture: {fileID: 0}
+ m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+ m_DefaultReflectionMode: 0
+ m_DefaultReflectionResolution: 128
+ m_ReflectionBounces: 1
+ m_ReflectionIntensity: 1
+ m_CustomReflection: {fileID: 0}
+ m_Sun: {fileID: 0}
+ m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+ m_UseRadianceAmbientProbe: 0
+--- !u!157 &24
+LightmapSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 11
+ m_GIWorkflowMode: 1
+ m_GISettings:
+ serializedVersion: 2
+ m_BounceScale: 1
+ m_IndirectOutputScale: 1
+ m_AlbedoBoost: 1
+ m_EnvironmentLightingMode: 0
+ m_EnableBakedLightmaps: 0
+ m_EnableRealtimeLightmaps: 0
+ m_LightmapEditorSettings:
+ serializedVersion: 10
+ m_Resolution: 2
+ m_BakeResolution: 40
+ m_AtlasSize: 1024
+ m_AO: 0
+ m_AOMaxDistance: 1
+ m_CompAOExponent: 1
+ m_CompAOExponentDirect: 0
+ m_Padding: 2
+ m_LightmapParameters: {fileID: 0}
+ m_LightmapsBakeMode: 1
+ m_TextureCompression: 1
+ m_FinalGather: 0
+ m_FinalGatherFiltering: 1
+ m_FinalGatherRayCount: 256
+ m_ReflectionCompression: 2
+ m_MixedBakeMode: 2
+ m_BakeBackend: 0
+ m_PVRSampling: 1
+ m_PVRDirectSampleCount: 32
+ m_PVRSampleCount: 500
+ m_PVRBounces: 2
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
+ m_PVRFilteringMode: 1
+ m_PVRCulling: 1
+ m_PVRFilteringGaussRadiusDirect: 1
+ m_PVRFilteringGaussRadiusIndirect: 5
+ m_PVRFilteringGaussRadiusAO: 2
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
+ m_ShowResolutionOverlay: 1
+ m_LightingDataAsset: {fileID: 0}
+ m_UseShadowmask: 1
+--- !u!114 &42
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 50
+--- !u!114 &43
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ForceModuleActive: 0
+--- !u!114 &44
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!1 &1013149005
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1013149006}
+ - component: {fileID: 1013149007}
+ - component: {fileID: 1013149008}
+ m_Layer: 0
+ m_Name: GameStart
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1013149006
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1013149005}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1013149007
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1013149005}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &1013149008
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1013149005}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ settingInfo:
+ logLevel: 4
+ isDebug: 0
+ bundleMode: 1
+ luaBundleMode: 1
+ isUpdate: 1
+ isSDK: 1
+ isSDKLogin: 1
+ isGuide: 1
+ isOpenGM: 0
+--- !u!4 &57277738265262265
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3471622135844523394}
+ 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: 0}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1362306110787991495
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3471622135844523394}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ enableLog: 1
+ networkType: 3
+ tokens:
+ - appid: 6946e0337f7e4ec3978c21e7e25ebf6c
+ serverUrl: https://thinkingdata.18183g.com
+ mode: 0
+ timeZone: 0
+ timeZoneId:
+--- !u!1 &3471622135844523394
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 57277738265262265}
+ - component: {fileID: 1362306110787991495}
+ - component: {fileID: 3471622135844523395}
+ - component: {fileID: 3471622135844523396}
+ m_Layer: 0
+ m_Name: SDKConfig
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &3471622135844523395
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3471622135844523394}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ appid: vd0gz4551ht6ja19
+ channel: "\u5996\u738B\u518D\u4E34"
+--- !u!114 &3471622135844523396
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3471622135844523394}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ appid: 1fc5a543ea
diff --git a/Assets/LuaFramework/Scenes/Logo_cn_xipu.unity.meta b/Assets/LuaFramework/Scenes/Logo_cn_xipu.unity.meta
new file mode 100644
index 0000000000..382be640c8
--- /dev/null
+++ b/Assets/LuaFramework/Scenes/Logo_cn_xipu.unity.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8012022ddd6834749a8e33e0db324811
+timeCreated: 1496386600
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png b/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png
new file mode 100644
index 0000000000..2206fd8f27
Binary files /dev/null and b/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png differ
diff --git a/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta b/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta
new file mode 100644
index 0000000000..14abf83c4b
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/SettingPlayerAtlas/r_Resource_Coin656.png.meta
@@ -0,0 +1,142 @@
+fileFormatVersion: 2
+guid: 34a9fb190da8e644aa2bc6b2f888c384
+TextureImporter:
+ fileIDToRecycleName:
+ 21300000: r_Resource_Coin656
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 2
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: r_Resource_Coin656
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 401
+ height: 142
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: 7c230c5c5c81db645958da23a5eb509b
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: a9a1c763a0e5a6942979dc5e3818a930
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/BG/dl_ui_effect_bg.png b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png
similarity index 100%
rename from Assets/ManagedResources/BG/dl_ui_effect_bg.png
rename to Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png
diff --git a/Assets/ManagedResources/BG/dl_ui_effect_bg.png.meta b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta
similarity index 100%
rename from Assets/ManagedResources/BG/dl_ui_effect_bg.png.meta
rename to Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta
diff --git a/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg
new file mode 100644
index 0000000000..d4e1b46542
Binary files /dev/null and b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg differ
diff --git a/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg.meta b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg.meta
new file mode 100644
index 0000000000..dba1e313bd
--- /dev/null
+++ b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: f56ac90088d7ac44ea4718d740e54e7b
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 57
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 986241f5c544a6540b8815a8abd01d2b
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi.mat b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat
similarity index 100%
rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi.mat
rename to Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat
diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi.mat.meta b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat.meta
similarity index 100%
rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi.mat.meta
rename to Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat.meta
diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun.png b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun_1.png
similarity index 100%
rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun.png
rename to Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun_1.png
diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun.png.meta b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun_1.png.meta
similarity index 100%
rename from Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun.png.meta
rename to Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_guangyun_1.png.meta
diff --git a/Assets/ManagedResources/Icon/Item/r_Resource_Coin_0006.png b/Assets/ManagedResources/Icon/Item/r_Resource_Coin_0006.png
new file mode 100644
index 0000000000..bf225834e2
Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/r_Resource_Coin_0006.png differ
diff --git a/Assets/ManagedResources/Icon/Item/r_Resource_Coin_0006.png.meta b/Assets/ManagedResources/Icon/Item/r_Resource_Coin_0006.png.meta
new file mode 100644
index 0000000000..2faf726c6b
--- /dev/null
+++ b/Assets/ManagedResources/Icon/Item/r_Resource_Coin_0006.png.meta
@@ -0,0 +1,142 @@
+fileFormatVersion: 2
+guid: 2ef3ec0b7be67034f90eea67b405e18e
+TextureImporter:
+ fileIDToRecycleName:
+ 21300000: r_Resource_Coin_0006
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 2
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: r_Resource_Coin_0006
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 150
+ height: 150
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: 1812375bb45676242bbae3d0d4b75f9d
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: d6d0df4b0529d0e42a87a2a1fc07b429
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua
index 316b8f3f12..7e3b60efe8 100644
--- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua
+++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua
@@ -206,6 +206,7 @@ ConfigName = {
WishActivitySetting = "WishActivitySetting",
WishActivityPool = "WishActivityPool",
WishActivityUp = "WishActivityUp",
+ PackageConfig = "PackageConfig",
}
require "Framework/GameDataBase"
diff --git a/Assets/ManagedResources/~Lua/Framework/Framework.lua b/Assets/ManagedResources/~Lua/Framework/Framework.lua
index 0b4d28959f..c6c032ab3d 100644
--- a/Assets/ManagedResources/~Lua/Framework/Framework.lua
+++ b/Assets/ManagedResources/~Lua/Framework/Framework.lua
@@ -12,6 +12,7 @@ require "Framework/Manager/ServerConfigManager"
require "Data/UIData"
require "Data/SoundData"
require "Data/ConfigData"
+require "Framework.Manager.PackageManager"
Framework = { }
@@ -91,6 +92,7 @@ function Framework. Initialize()
poolManager = PoolManager:new()
CardRendererManager.Initialize()
ServerConfigManager.Initialize()
+ PackageManager.Initialize()
UpdateBeat:Add(update, Framework)
end
diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua
new file mode 100644
index 0000000000..24f65819a0
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua
@@ -0,0 +1,28 @@
+PackageManager = {}
+local this = PackageManager
+function PackageManager.Initialize()
+ this.PackageName = "test"
+ if AppConst.isSDK then
+ this.PackageName = AndroidDeviceInfo.Instance:GetPackageName()
+ end
+ LogGreen("当前包名为:"..this.PackageName)
+ local PackagerConfig = ConfigManager.GetConfig(ConfigName.PackageConfig)
+ for _, config in ConfigPairs(PackagerConfig) do
+ if config.PackageName == this.PackageName then
+ this.config = config
+ end
+ end
+end
+
+-- 获取包名
+function PackageManager.GetPackageName()
+ return this.PackageName
+end
+-- 获取充值计费点字段
+function PackageManager.GetRechargeField()
+ return this.config.RechargeField
+end
+-- 获取登录背景图
+function PackageManager.GetLoginPanelBg()
+ return this.config.LoginPanelBg
+end
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua.meta b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua.meta
new file mode 100644
index 0000000000..ac1beb447b
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e1a57571dda0efa48a9b81d655149b23
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua
index 510ec30e4e..b71a0434f4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua
@@ -33,8 +33,12 @@ local _ConditionConfig = {
local v2 = condition[2]
local record = HardStageEventManager.GetRoundDamageRecord()
if record then
- if record[v1] and record[v1] >= v2 then
- return 1
+ if record then
+ for key, value in pairs(record) do
+ if key<=v1 and value>=v2 then
+ return 1
+ end
+ end
end
end
return 0
diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
index 3a71d915e0..b908b8b8b8 100644
--- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
@@ -20,15 +20,9 @@ function this.SendCustomEvents(CustomType,info)
if CustomType == configInfo.CustomEventType and (configInfo.value == "0" or info == tonumber(configInfo.value)) then
curConfigData = configInfo
if curConfigData then
- if AppConst.SdkPackageName == "com.tcxazcsb.pass" then
- --LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidTest.." "..curConfigData.Info)
- this.SendCustomEvent(curConfigData.tokenAndroidTest,curConfigData.Info,curConfigData.type)
- elseif AppConst.SdkPackageName == "com.tcxaz.pass" then
- --LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidRelease.." "..curConfigData.Info)
- this.SendCustomEvent(curConfigData.tokenAndroidRelease,curConfigData.Info,curConfigData.type)
- elseif AppConst.SdkPackageName == "com.tcx.pass" then
- --LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenIos.." "..curConfigData.Info)
- this.SendCustomEvent(curConfigData.tokenIos,curConfigData.Info,curConfigData.type)
+ local field = PackageManager.GetCustomEventField()
+ if field and curConfigData[field] and curConfigData[field] ~= "" then
+ this.SendCustomEvent(curConfigData[field], curConfigData.Info, curConfigData.type)
end
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
index 8878326918..97315603bc 100644
--- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
@@ -225,9 +225,9 @@ function TimeLimitedCall:Recruit(recrutType,recrutId,bType)
PrivilegeManager.RefreshPrivilegeUsedTimes(self.maxtimesId,recrutType)--记录抽卡次数
if bType == 1 then
- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.itemlist[1],recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
+ UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
else
- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.itemlist,recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
+ UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
end
CheckRedPointStatus(RedPointType.TimeLimited)
end,self.freeTimesId)
diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
index 73f76bc289..64ab561b00 100644
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
@@ -484,9 +484,11 @@ function this.RefreshPanelShowByState()
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
PlayerManager.carbonType = 1
if ExpeditionManager.ExpeditionState == 2 then
+ UIManager.ClosePanel(UIName.ExpeditionMainPanel)
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12183])
elseif ExpeditionManager.ExpeditionState == 3 then
+ UIManager.ClosePanel(UIName.ExpeditionMainPanel)
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12183])
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index fb80c16ac6..e816dc0d51 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -31,6 +31,11 @@ function this:InitComponent()
this.spLoader = SpriteLoader.New()
orginLayer = 0
this.loginPart = this.gameObject
+
+ local bg = Util.GetGameObject(this.gameObject, "bg"):GetComponent("Image")
+ local bgStr = PackageManager.GetLoginPanelBg()
+ bg.sprite = this.spLoader:LoadSprite(bgStr)
+
this.tip = Util.GetGameObject(this.loginPart, "tip/Text")
this.loginAnim = this.gameObject:GetComponent("Animator")
diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua
index f1a5c2dbac..302253bcd2 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua
@@ -74,12 +74,9 @@ function this.SdkPay(context)
payData.Type = rechargeConfig.Type
-- 判断计费点
- if AppConst.SdkPackageName == "com.tcxazcsb.pass" or AppConst.SdkPackageName == "com.tcxaz.pass" then -- 海外GP 测试+正式
- payData.RechargeId = rechargeConfig.RechargeId
- elseif AppConst.SdkPackageName == "com.jltest.www" then -- 海外Ios测试
- payData.RechargeId = rechargeConfig.RechargeId2
- elseif AppConst.SdkPackageName == "com.tcxhw.project" then -- 海外Ios正式
- payData.RechargeId = rechargeConfig.RechargeId3
+ local field = PackageManager.GetRechargeField()
+ if field and rechargeConfig[field] and rechargeConfig[field] ~= "" then
+ payData.RechargeId = rechargeConfig[field]
else
payData.RechargeId = rechargeConfig.Id
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
index 45ae8ea7bd..79c84df2a2 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
@@ -75,7 +75,7 @@ function this:OnShow(_parent,...)
elseif curType == 3 then
rewardData,rewardData1 = EndLessMapManager.GetAllRewardData()
this:showRewardWuJin(rewardData,rewardData1)
- this.tip.text = "解锁秘宝,激活进阶专属奖励+2000积分,可获取980妖晶"
+ this.tip.text = "解锁秘宝,激活进阶专属奖励+2000积分,可获取1280妖晶"
this.dealBtnIma.gameObject:SetActive(false)
this.dealBtnText.gameObject:SetActive(true)
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)