diff --git a/AssetBundles/version.txt b/AssetBundles/version.txt index f10a20f4c9..aa5c220c10 100644 --- a/AssetBundles/version.txt +++ b/AssetBundles/version.txt @@ -1 +1 @@ -{"buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "subChannel":"1", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file +{"subChannel":"1", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file diff --git a/Assets/Effect/Animation.meta b/Assets/Effect/Animation.meta new file mode 100644 index 0000000000..f552eee2e1 --- /dev/null +++ b/Assets/Effect/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30ec9ad22f181654b81d8aa34d997868 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Materials.meta b/Assets/Effect/Materials.meta new file mode 100644 index 0000000000..65ebb3ffe7 --- /dev/null +++ b/Assets/Effect/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1213879cc7c0b4d46a8d793b939a06e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Prefab.meta b/Assets/Effect/Prefab.meta new file mode 100644 index 0000000000..900e50ab30 --- /dev/null +++ b/Assets/Effect/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4dc38530a3ad8af47b2f065ccc50ea54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Prefab/UI.meta b/Assets/Effect/Prefab/UI.meta new file mode 100644 index 0000000000..90b8b3bbb6 --- /dev/null +++ b/Assets/Effect/Prefab/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c43dca7af2907d4c913828dbe5b27b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Texture.meta b/Assets/Effect/Texture.meta new file mode 100644 index 0000000000..e0d58d2d10 --- /dev/null +++ b/Assets/Effect/Texture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2a124da35999014cb86e0aa5187e8a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity index db2d514c33..b1e84494cd 100644 --- a/Assets/LuaFramework/Scenes/Logo.unity +++ b/Assets/LuaFramework/Scenes/Logo.unity @@ -273,13 +273,74 @@ MonoBehaviour: settingInfo: logLevel: 0 isDebug: 0 - bundleMode: 1 - luaBundleMode: 1 + bundleMode: 0 + luaBundleMode: 0 isUpdate: 0 - isSDK: 1 + isSDK: 0 isSDKLogin: 0 - isGuide: 1 + isGuide: 0 isOpenGM: 1 +--- !u!1001 &1534980096 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 118256, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_Name + value: UIRoot + objectReference: {fileID: 0} + - target: {fileID: 118256, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} --- !u!4 &57277738265262265 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan03.png b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan03.png index 4823b700eb..ec49ab9a9d 100644 Binary files a/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan03.png and b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan03.png differ diff --git a/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_qiankunshangdian_01.png b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_qiankunshangdian_01.png new file mode 100644 index 0000000000..c0ba873afc Binary files /dev/null and b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_qiankunshangdian_01.png differ diff --git a/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_shangdiananniu_01.png.meta b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_qiankunshangdian_01.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_shangdiananniu_01.png.meta rename to Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_qiankunshangdian_01.png.meta index 9f839d1e8a..4b02e54b83 100644 --- a/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_shangdiananniu_01.png.meta +++ b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_qiankunshangdian_01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c21ea1329edbe84cb6d34f132241a1d +guid: e35933d2dc312ae4e84fb44f4ceb0541 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 7417a16f66949e74c8233f7ec3771850 + spriteID: 78ad8f3d09495cb4f9596cb521054d54 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_shangdiananniu_01.png b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_shangdiananniu_01.png deleted file mode 100644 index 8765f70b7a..0000000000 Binary files a/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_shangdiananniu_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/s_shop_qiankun.png b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_qiankun.png new file mode 100644 index 0000000000..2d107cec8c Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_qiankun.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/s_shop_qiankun.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_qiankun.png.meta new file mode 100644 index 0000000000..a23e8970ce --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_qiankun.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: db5b1aefbb74e024c97bf106a0c4a809 +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: e555dfeca437acf41970c1c6cf3987fd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/s_shop_senluo.png b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_senluo.png new file mode 100644 index 0000000000..e44287e128 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_senluo.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/s_shop_senluo.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_senluo.png.meta new file mode 100644 index 0000000000..977c98ef85 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/s_shop_senluo.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: dc158ecf6f9965b43b75405f334c4758 +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: 1d142dfd8a037f04a944f8e87a3b21f0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png b/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png index 5110760f32..aab87c64d2 100644 Binary files a/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png and b/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png.meta index 1feb7251bc..d0f56fd3b6 100644 --- a/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png.meta +++ b/Assets/ManagedResources/Atlas/TagAtlas/t_tqsc_jisu2.png.meta @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: d15e58df6208e4d4fbf220740d976ac7 + spriteID: cee5159f8efb5914aac531c1367582f7 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta index 230edfafe6..c3473d7616 100644 --- a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81f37d3299f379044b1d104af34d5317 +guid: 34977f2f2a3896341867789572afa609 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index 3cacb46803..e4a5b40dda 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -1732,7 +1732,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224022179357799424 RectTransform: m_ObjectHideFlags: 0 @@ -5830,9 +5830,9 @@ RectTransform: m_Father: {fileID: 4693386617891966018} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 122, y: -38.17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7522942682079678097 @@ -16213,9 +16213,9 @@ RectTransform: m_Father: {fileID: 2563449696537189548} 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: 75, y: -83.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6956935737205087937 @@ -43447,9 +43447,9 @@ RectTransform: m_Father: {fileID: 2619250708224743012} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 117.8, y: -38.17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1710377963916506075 @@ -45834,9 +45834,9 @@ RectTransform: m_Father: {fileID: 2619250708224743012} 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: 40.15, y: -38.17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 80.3, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5638541037889376890 @@ -49500,9 +49500,9 @@ RectTransform: m_Father: {fileID: 4693386617891966018} 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: 39.666668, y: -38.17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 69, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &532619474986438430 @@ -54909,9 +54909,9 @@ RectTransform: m_Father: {fileID: 2619250708224743012} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.55, y: -38.17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 76.5, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4296817861848931118 @@ -75788,9 +75788,9 @@ RectTransform: m_Father: {fileID: 2563449696537189548} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -250.20001} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 123, y: 123} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1237614083773060768 @@ -75821,7 +75821,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7c21ea1329edbe84cb6d34f132241a1d, type: 3} + m_Sprite: {fileID: 21300000, guid: e35933d2dc312ae4e84fb44f4ceb0541, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -77815,9 +77815,9 @@ RectTransform: m_Father: {fileID: 4693386617891966018} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.33334, y: -38.17} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6749233589532361498 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index eef40d86f7..76ab1337f1 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -4171,10 +4171,6 @@ MonoBehaviour: extension: .png resPathIndex: 13 resAbNameIndex: 5 - - resName: r_Dungeon_senluohuanjing - extension: .png - resPathIndex: 13 - resAbNameIndex: 5 - resName: r_Dungeon_shilianfuben extension: .png resPathIndex: 13 @@ -4183,10 +4179,6 @@ MonoBehaviour: extension: .png resPathIndex: 13 resAbNameIndex: 5 - - resName: r_Dungeon_wanxiangjing - extension: .png - resPathIndex: 13 - resAbNameIndex: 5 - resName: r_Dungeon_wujinfuben extension: .png resPathIndex: 13 @@ -4195,10 +4187,6 @@ MonoBehaviour: extension: .png resPathIndex: 13 resAbNameIndex: 5 - - resName: r_Dungeon_xuanyuanbaojing - extension: .png - resPathIndex: 13 - resAbNameIndex: 5 - resName: r_Dungeon_xuanze_jiandan extension: .png resPathIndex: 13 @@ -4311,10 +4299,6 @@ MonoBehaviour: extension: .jpg resPathIndex: 13 resAbNameIndex: 5 - - resName: x_xianyuan_gailvjiaobiao - extension: .png - resPathIndex: 13 - resAbNameIndex: 5 - resName: x_xianyuan_paibian extension: .png resPathIndex: 13 @@ -4323,10 +4307,6 @@ MonoBehaviour: extension: .jpg resPathIndex: 13 resAbNameIndex: 5 - - resName: x_xianyuan_shoucijiaobiao - extension: .png - resPathIndex: 13 - resAbNameIndex: 5 - resName: x_xianyuan_yaolingtu01 extension: .jpg resPathIndex: 13 @@ -9951,7 +9931,7 @@ MonoBehaviour: extension: .png resPathIndex: 56 resAbNameIndex: 29 - - resName: q_qiankun_shangdiananniu_01 + - resName: q_qiankun_qiankunshangdian_01 extension: .png resPathIndex: 56 resAbNameIndex: 29 @@ -11139,6 +11119,14 @@ MonoBehaviour: extension: .png resPathIndex: 71 resAbNameIndex: 38 + - resName: s_shop_qiankun + extension: .png + resPathIndex: 71 + resAbNameIndex: 38 + - resName: s_shop_senluo + extension: .png + resPathIndex: 71 + resAbNameIndex: 38 - resName: s_shop_shilian extension: .png resPathIndex: 71 @@ -16655,10 +16643,6 @@ MonoBehaviour: extension: .jpg resPathIndex: 117 resAbNameIndex: 1088 - - resName: m_chsm_0035 - extension: .png - resPathIndex: 117 - resAbNameIndex: 1088 - resName: m_syjm_0026_png extension: .png resPathIndex: 117 @@ -35523,6 +35507,10 @@ MonoBehaviour: extension: .txt resPathIndex: 355 resAbNameIndex: 1755 + - resName: m_chsm_0035 + extension: .png + resPathIndex: 355 + resAbNameIndex: 1755 - resName: m_chsm_0035.skel extension: .bytes resPathIndex: 355 @@ -35535,10 +35523,6 @@ MonoBehaviour: extension: .mat resPathIndex: 355 resAbNameIndex: 1755 - - resName: m_chsm_0035_png - extension: .png - resPathIndex: 355 - resAbNameIndex: 1755 - resName: m_chsm_0035_SkeletonData extension: .asset resPathIndex: 355 @@ -41305,7 +41289,6 @@ MonoBehaviour: - lz4/dynamicatlas/r_guaji_tansuotongji_xiabian.unity3d - lz4/dynamicatlas/r_guaji_tansuotongjizi_xiaguang.unity3d - lz4/dynamicatlas/r_hero_di020.unity3d - - lz4/dynamicatlas/r_hunyin_hunyinkuangzise001.unity3d - lz4/dynamicatlas/r_map_di 1.unity3d - lz4/dynamicatlas/r_shilian-diquan.unity3d - lz4/dynamicatlas/r_shilian-menghei.unity3d @@ -41328,7 +41311,6 @@ MonoBehaviour: - lz4/fonts/powerfont.unity3d - lz4/fonts/powernewfont.unity3d - lz4/icons.unity3d - - lz4/prefabs/ui/view.unity3d - lz4/publicartres/animations.unity3d - lz4/publicartres/materials.unity3d - lz4/publicartres/models.unity3d diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index 233dc1f80b..3fdb9b2885 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua @@ -59,6 +59,9 @@ end function EightDayGiftPanel:Refresh() rewardData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.EightDayGift) curDay = math.ceil((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400) + if curDay>8 then + curDay = 8 + end this.SetAllReward() this:SetBg() end @@ -69,6 +72,7 @@ function EightDayGiftPanel:SetBg(i) local ren = Util.GetGameObject(this.gameObject,"panel/bg/ren") local day = Util.GetGameObject(this.gameObject,"panel/bg/tip/day"):GetComponent("Image") local tip = Util.GetGameObject(this.gameObject,"panel/bg/tip"):GetComponent("Image") + local stars = Util.GetGameObject(this.gameObject,"panel/bg/tip/stars") local num,text,id local bgScale = Vector3 @@ -90,6 +94,7 @@ function EightDayGiftPanel:SetBg(i) ren:GetComponent("Image").sprite = Util.LoadSprite(bgName) ren:GetComponent("Image").enabled= true this.btnPreview:SetActive(false) + stars:SetActive(false) else this.btnPreview:SetActive(true) num = tostring(day_picture[i][1])--天数 @@ -100,6 +105,7 @@ function EightDayGiftPanel:SetBg(i) bgPos = day_picture[i][6] day.sprite = Util.LoadSprite(num) tip.sprite = Util.LoadSprite(text) + stars:SetActive(true) Util.AddOnceClick(this.btnPreview,function() UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, id, 10) end) @@ -118,8 +124,10 @@ function EightDayGiftPanel:SetBg(i) tip.sprite = Util.LoadSprite(text) ren:GetComponent("Image").sprite = Util.LoadSprite(bgName) ren:GetComponent("Image").enabled= true + stars:SetActive(false) else this.btnPreview:SetActive(true) + stars:SetActive(true) if rewardData.mission[curDay].state == 1 and curDay ~= 8 then num = tostring(day_picture[curDay+1][1]) text = tostring(day_picture[curDay+1][3]) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index 07cf4f7fed..ca7facb626 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -13,352 +13,352 @@ MonoBehaviour: m_Name: DataConfigMD5Record m_EditorClassIdentifier: _keys: - - D:\JL_Client/data_execl/base_data\ArenaRobotConfig.xlsx - - D:\JL_Client/data_execl/base_data\EndlessDifficulty.xlsx - - D:\JL_Client/data_execl/base_data\ErrorCodeEerverConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArenaRobotSetting.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsBoxPools.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsBoxSeaons.xlsx - - D:\JL_Client/data_execl/base_data\BloodyMessagesConfig.xlsx - - D:\JL_Client/data_execl/base_data\AdventureReward.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleSetting.xlsx - - D:\JL_Client/data_execl/base_data\GuildBossRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipStarsConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildBossConfig.xlsx - - D:\JL_Client/data_execl/base_data\BloodyRankConfig.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleTreasure.xlsx - - D:\JL_Client/data_execl/base_data\ActivityDropReward.xlsx - - D:\JL_Client/data_execl/base_data\DailyChallengeConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArenaSetting.xlsx - - D:\JL_Client/data_execl/base_data\DialRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\EndlessMapConfig.xlsx - - D:\JL_Client/data_execl/base_data\AreaConfig.xlsx - - D:\JL_Client/data_execl/base_data\BeginnerTask.xlsx - - D:\JL_Client/data_execl/base_data\GuildScoreConfig.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleReward.xlsx - - D:\JL_Client/data_execl/base_data\EquipSuiteConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArenaBattleReward.xlsx - - D:\JL_Client/data_execl/base_data\BuffEffectConfig.xlsx - D:\JL_Client/data_execl/base_data\BlessingConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChampionshipSetting.xlsx - - D:\JL_Client/data_execl/base_data\BlessingRewardPool.xlsx - - D:\JL_Client/data_execl/base_data\GuildWarRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\AudioConfig.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleTask.xlsx - - D:\JL_Client/data_execl/base_data\GuildRedPackConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildSacrificeRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\BloodyBattleReward.xlsx + - D:\JL_Client/data_execl/base_data\ArenaRobotConfig.xlsx + - D:\JL_Client/data_execl/base_data\ArenaRobotSetting.xlsx + - D:\JL_Client/data_execl/base_data\BloodyMessagesConfig.xlsx - D:\JL_Client/data_execl/base_data\DailyTasksConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildWarConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\AccomplishmentConfig.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsConfig.xlsx + - D:\JL_Client/data_execl/base_data\BloodyBattleTreasure.xlsx + - D:\JL_Client/data_execl/base_data\DifferDemonsBoxSeaons.xlsx + - D:\JL_Client/data_execl/base_data\ErrorCodeEerverConfig.xlsx + - D:\JL_Client/data_execl/base_data\EndlessDifficulty.xlsx + - D:\JL_Client/data_execl/base_data\DifferDemonsBoxPools.xlsx + - D:\JL_Client/data_execl/base_data\ArenaBattleReward.xlsx + - D:\JL_Client/data_execl/base_data\BloodyBattleSetting.xlsx - D:\JL_Client/data_execl/base_data\BeStronger.xlsx - - D:\JL_Client/data_execl/base_data\ArenaReward.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeMapConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeMissionConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipConfig.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsBoxSetting.xlsx - - D:\JL_Client/data_execl/base_data\EquipTalismanaLottery.xlsx - - D:\JL_Client/data_execl/base_data\EquipPropertyPool.xlsx - - D:\JL_Client/data_execl/base_data\ChapterOptionConfig.xlsx - D:\JL_Client/data_execl/base_data\CombatControl.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeStarBox.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionFloorConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExchangeActivityConfig.xlsx - - D:\JL_Client/data_execl/base_data\DialRewardSetting.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeSetting.xlsx - - D:\JL_Client/data_execl/base_data\JumpConfig.xlsx - - D:\JL_Client/data_execl/base_data\LotterySetting.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsStageConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArtResourcesConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChapterEventPointConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChampionshipReward.xlsx - - D:\JL_Client/data_execl/base_data\GuildSetting.xlsx - - D:\JL_Client/data_execl/base_data\MazeTreasure.xlsx - - D:\JL_Client/data_execl/base_data\LoginPosterConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroRankupConfig.xlsx - - D:\JL_Client/data_execl/base_data\LotterySpecialConfig.xlsx - - D:\JL_Client/data_execl/base_data\LuckyCatConfig.xlsx - - D:\JL_Client/data_execl/base_data\LevelDifficultyConfig.xlsx - - D:\JL_Client/data_execl/base_data\SeverConfig.xlsx - - D:\JL_Client/data_execl/base_data\MazeTreasureSetting.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx - - D:\JL_Client/data_execl/base_data\LuxuryFund.xlsx - - D:\JL_Client/data_execl/base_data\LotteryRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\MainLevelSettingConfig.xlsx - - D:\JL_Client/data_execl/base_data\RewardItemConfig.xlsx - - D:\JL_Client/data_execl/base_data\MainMapIconConfig.xlsx - - D:\JL_Client/data_execl/base_data\RunesConfig.xlsx - - D:\JL_Client/data_execl/base_data\MonsterViewConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroReturn.xlsx - - D:\JL_Client/data_execl/base_data\JewelResonanceConfig.xlsx - - D:\JL_Client/data_execl/base_data\JewelConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroRankupGroup.xlsx - - D:\JL_Client/data_execl/base_data\RoleConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildTechnology.xlsx - - D:\JL_Client/data_execl/base_data\MissionEventsConfig.xlsx - - D:\JL_Client/data_execl/base_data\FloodConfig.xlsx - - D:\JL_Client/data_execl/base_data\FoodsConfig.xlsx - - D:\JL_Client/data_execl/base_data\ElementalResonanceConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\ErrorCodeHint.xlsx - - D:\JL_Client/data_execl/base_data\GuildSacrificeConfig.xlsx + - D:\JL_Client/data_execl/base_data\ArenaSetting.xlsx + - D:\JL_Client/data_execl/base_data\BlessingRewardPool.xlsx + - D:\JL_Client/data_execl/base_data\ActivityDropReward.xlsx + - D:\JL_Client/data_execl/base_data\BloodyBattleTask.xlsx - D:\JL_Client/data_execl/base_data\ActivityRankingReward.xlsx + - D:\JL_Client/data_execl/base_data\AdventureReward.xlsx + - D:\JL_Client/data_execl/base_data\AudioConfig.xlsx + - D:\JL_Client/data_execl/base_data\AreaConfig.xlsx + - D:\JL_Client/data_execl/base_data\ArenaReward.xlsx + - D:\JL_Client/data_execl/base_data\BeginnerTask.xlsx + - D:\JL_Client/data_execl/base_data\ChallengeConfig.xlsx + - D:\JL_Client/data_execl/base_data\EquipStarsConfig.xlsx + - D:\JL_Client/data_execl/base_data\AchievementConfig.xlsx + - D:\JL_Client/data_execl/base_data\BuffEffectConfig.xlsx + - D:\JL_Client/data_execl/base_data\ChallengeSetting.xlsx + - D:\JL_Client/data_execl/base_data\DialRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\BloodyRankConfig.xlsx + - D:\JL_Client/data_execl/base_data\EquipSignSetting.xlsx + - D:\JL_Client/data_execl/base_data\EndlessMapConfig.xlsx + - D:\JL_Client/data_execl/base_data\ChallengeMapConfig.xlsx + - D:\JL_Client/data_execl/base_data\EquipTalismanaLottery.xlsx + - D:\JL_Client/data_execl/base_data\ElementalResonanceConfig.xlsx + - D:\JL_Client/data_execl/base_data\EquipSuiteConfig.xlsx + - D:\JL_Client/data_execl/base_data\ErrorCodeHint.xlsx - D:\JL_Client/data_execl/base_data\EquipTalismanaRankup.xlsx - - D:\JL_Client/data_execl/base_data\AdventureConfig.xlsx - - D:\JL_Client/data_execl/base_data\ActivityRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\ChallengeMissionConfig.xlsx + - D:\JL_Client/data_execl/base_data\DifferDemonsBoxSetting.xlsx + - D:\JL_Client/data_execl/base_data\ChapterEventPointConfig.xlsx + - D:\JL_Client/data_execl/base_data\AccomplishmentConfig.xlsx + - D:\JL_Client/data_execl/base_data\EquipSign.xlsx + - D:\JL_Client/data_execl/base_data\ExpeditionSetting.xlsx + - D:\JL_Client/data_execl/base_data\DailyChallengeConfig.xlsx + - D:\JL_Client/data_execl/base_data\DialogueViewConfig.xlsx - D:\JL_Client/data_execl/base_data\ExpeditionNodeConfig.xlsx - D:\JL_Client/data_execl/base_data\ExpeditionRecruitConfig.xlsx - - D:\JL_Client/data_execl/base_data\SpecialConfig.xlsx - - D:\JL_Client/data_execl/base_data\SystemMessageConfig.xlsx - - D:\JL_Client/data_execl/base_data\LevelSetting.xlsx - - D:\JL_Client/data_execl/base_data\OptionAddCondition.xlsx - - D:\JL_Client/data_execl/base_data\PlayerAppearance.xlsx - - D:\JL_Client/data_execl/base_data\ItemConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionHolyConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipSign.xlsx - - D:\JL_Client/data_execl/base_data\EquipSignSetting.xlsx - - D:\JL_Client/data_execl/base_data\GuildHelpConfig.xlsx - - D:\JL_Client/data_execl/base_data\GameSetting.xlsx - - D:\JL_Client/data_execl/base_data\DialogueViewConfig.xlsx - - D:\JL_Client/data_execl/base_data\SignInConfig.xlsx - - D:\JL_Client/data_execl/base_data\MapPointConfig.xlsx - - D:\JL_Client/data_execl/base_data\RunesPoolConfig.xlsx - - D:\JL_Client/data_execl/base_data\MonthcardConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionSetting.xlsx - - D:\JL_Client/data_execl/base_data\AchievementConfig.xlsx - - D:\JL_Client/data_execl/base_data\GlobalActivity.xlsx - - D:\JL_Client/data_execl/base_data\GlobalSystemConfig.xlsx - - D:\JL_Client/data_execl/base_data\FakeBattle.xlsx - - D:\JL_Client/data_execl/base_data\StoreTypeConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialKillConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuideConfig.xlsx - - D:\JL_Client/data_execl/base_data\SevenDaysActivity.xlsx - D:\JL_Client/data_execl/base_data\ExploreFunctionConfig.xlsx - - D:\JL_Client/data_execl/base_data\RaceTowerRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialwelfareConfig.xlsx - - D:\JL_Client/data_execl/base_data\RechargeCommodityConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildRewardConfig.xlsx - D:\JL_Client/data_execl/base_data\HeroSacrifice.xlsx + - D:\JL_Client/data_execl/base_data\ChapterOptionConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildSacrificeRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildScoreConfig.xlsx + - D:\JL_Client/data_execl/base_data\EquipPropertyPool.xlsx + - D:\JL_Client/data_execl/base_data\DifferDemonsConfig.xlsx + - D:\JL_Client/data_execl/base_data\ChallengeStarBox.xlsx + - D:\JL_Client/data_execl/base_data\DialRewardSetting.xlsx + - D:\JL_Client/data_execl/base_data\ChampionshipSetting.xlsx + - D:\JL_Client/data_execl/base_data\FoodsConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildSetting.xlsx + - D:\JL_Client/data_execl/base_data\GuildWarConfig.xlsx + - D:\JL_Client/data_execl/base_data\JewelConfig.xlsx + - D:\JL_Client/data_execl/base_data\ChampionshipReward.xlsx + - D:\JL_Client/data_execl/base_data\MainMapIconConfig.xlsx + - D:\JL_Client/data_execl/base_data\MonthcardConfig.xlsx + - D:\JL_Client/data_execl/base_data\FakeBattle.xlsx + - D:\JL_Client/data_execl/base_data\JewelResonanceConfig.xlsx + - D:\JL_Client/data_execl/base_data\ExchangeActivityConfig.xlsx + - D:\JL_Client/data_execl/base_data\LuckyCatConfig.xlsx + - D:\JL_Client/data_execl/base_data\LotterySetting.xlsx + - D:\JL_Client/data_execl/base_data\HeroRankupGroup.xlsx + - D:\JL_Client/data_execl/base_data\HeroRankupConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuideConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildBossRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\LevelSetting.xlsx + - D:\JL_Client/data_execl/base_data\EquipConfig.xlsx + - D:\JL_Client/data_execl/base_data\OptionAddCondition.xlsx + - D:\JL_Client/data_execl/base_data\GuildSacrificeConfig.xlsx + - D:\JL_Client/data_execl/base_data\LotterySpecialConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildWarRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\MonsterViewConfig.xlsx + - D:\JL_Client/data_execl/base_data\RunesConfig.xlsx + - D:\JL_Client/data_execl/base_data\SevenDaysActivity.xlsx + - D:\JL_Client/data_execl/base_data\RunesPoolConfig.xlsx + - D:\JL_Client/data_execl/base_data\SeverConfig.xlsx + - D:\JL_Client/data_execl/base_data\SignInConfig.xlsx + - D:\JL_Client/data_execl/base_data\SevenDaysScore.xlsx + - D:\JL_Client/data_execl/base_data\MazeTreasure.xlsx + - D:\JL_Client/data_execl/base_data\SpecialConfig.xlsx + - D:\JL_Client/data_execl/base_data\PlayerMountLevelUp.xlsx + - D:\JL_Client/data_execl/base_data\SystemMessageConfig.xlsx + - D:\JL_Client/data_execl/base_data\TestWelfare.xlsx + - D:\JL_Client/data_execl/base_data\PlayerAppearance.xlsx + - D:\JL_Client/data_execl/base_data\TaskConfig.xlsx + - D:\JL_Client/data_execl/base_data\ExpeditionFloorConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildRedPackConfig.xlsx + - D:\JL_Client/data_execl/base_data\JumpConfig.xlsx + - D:\JL_Client/data_execl/base_data\ExpeditionHolyConfig.xlsx + - D:\JL_Client/data_execl/base_data\AdventureConfig.xlsx + - D:\JL_Client/data_execl/base_data\LuxuryFund.xlsx + - D:\JL_Client/data_execl/base_data\TreasureSunlongConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildHelpConfig.xlsx + - D:\JL_Client/data_execl/base_data\LoginPosterConfig.xlsx + - D:\JL_Client/data_execl/base_data\DifferDemonsStageConfig.xlsx + - D:\JL_Client/data_execl/base_data\GlobalSystemConfig.xlsx + - D:\JL_Client/data_execl/base_data\ArtResourcesConfig.xlsx + - D:\JL_Client/data_execl/base_data\MissionEventsConfig.xlsx + - D:\JL_Client/data_execl/base_data\MazeTreasureSetting.xlsx + - D:\JL_Client/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildBossConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildLevelConfig.xlsx + - D:\JL_Client/data_execl/base_data\GameSetting.xlsx + - D:\JL_Client/data_execl/base_data\MainLevelSettingConfig.xlsx + - D:\JL_Client/data_execl/base_data\TrialGameConfig.xlsx + - D:\JL_Client/data_execl/base_data\TrialKillConfig.xlsx + - D:\JL_Client/data_execl/base_data\TreasureSunlongTaskConfig.xlsx + - D:\JL_Client/data_execl/base_data\TrialSetting.xlsx + - D:\JL_Client/data_execl/base_data\TrialwelfareConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorkShopFoundationConfig.xlsx + - D:\JL_Client/data_execl/base_data\VipLevelConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorkShopFunctionConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorkShopRebuildConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorkShopTechnologySetting.xlsx + - D:\JL_Client/data_execl/base_data\WorldBossConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorkShopEquipmentConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorldBossSetting.xlsx + - D:\JL_Client/data_execl/base_data\WorldBossRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\WorkShopSetting.xlsx + - D:\JL_Client/data_execl/base_data\WorldBossTreasureConfig.xlsx + - D:\JL_Client/data_execl/base_data\GlobalActivity.xlsx - D:\JL_Client/data_execl/base_data\PlayerRole.xlsx + - D:\JL_Client/data_execl/base_data\PlayerLevelConfig.xlsx + - D:\JL_Client/data_execl/base_data\HeroReturn.xlsx + - D:\JL_Client/data_execl/base_data\TreasureTaskConfig.xlsx + - D:\JL_Client/data_execl/base_data\RoleConfig.xlsx + - D:\JL_Client/data_execl/base_data\UIConfig.xlsx + - D:\JL_Client/data_execl/base_data\TrialConfig.xlsx + - D:\JL_Client/data_execl/base_data\HeroConfig.xlsx + - D:\JL_Client/data_execl/base_data\ItemConfig.xlsx + - D:\JL_Client/data_execl/base_data\TrialQuestionConfig.xlsx + - D:\JL_Client/data_execl/base_data\StoreTypeConfig.xlsx + - D:\JL_Client/data_execl/base_data\LevelDifficultyConfig.xlsx + - D:\JL_Client/data_execl/base_data\HeroLevelConfig.xlsx + - D:\JL_Client/data_execl/base_data\LotteryRewardConfig.xlsx + - D:\JL_Client/data_execl/base_data\JewelRankupConfig.xlsx + - D:\JL_Client/data_execl/base_data\PrivilegeTypeConfig.xlsx + - D:\JL_Client/data_execl/base_data\RewardItemConfig.xlsx + - D:\JL_Client/data_execl/base_data\FloodConfig.xlsx - D:\JL_Client/data_execl/base_data\RaceTowerConfig.xlsx - D:\JL_Client/data_execl/base_data\RecommendTeam.xlsx - - D:\JL_Client/data_execl/base_data\PropertyConfig.xlsx - D:\JL_Client/data_execl/base_data\QAConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialQuestionConfig.xlsx - - D:\JL_Client/data_execl/base_data\TreasureTaskConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopRebuildConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopFunctionConfig.xlsx - - D:\JL_Client/data_execl/base_data\TaskConfig.xlsx - - D:\JL_Client/data_execl/base_data\PlayerMountLevelUp.xlsx - - D:\JL_Client/data_execl/base_data\TreasureSunlongConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopFoundationConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialSetting.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossSetting.xlsx - - D:\JL_Client/data_execl/base_data\PlayerLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\TestWelfare.xlsx - - D:\JL_Client/data_execl/base_data\UIConfig.xlsx - - D:\JL_Client/data_execl/base_data\PrivilegeTypeConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossTreasureConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialGameConfig.xlsx + - D:\JL_Client/data_execl/base_data\PropertyConfig.xlsx + - D:\JL_Client/data_execl/base_data\ActivityRewardConfig.xlsx - D:\JL_Client/data_execl/base_data\RandomName.xlsx - - D:\JL_Client/data_execl/base_data\SevenDaysScore.xlsx - - D:\JL_Client/data_execl/base_data\VipLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopTechnologySetting.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopSetting.xlsx - - D:\JL_Client/data_execl/base_data\TreasureSunlongTaskConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopEquipmentConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossConfig.xlsx + - D:\JL_Client/data_execl/base_data\MapPointConfig.xlsx - D:\JL_Client/data_execl/base_data\PassiveSkillConfig.xlsx - - D:\JL_Client/data_execl/base_data\JewelRankupConfig.xlsx - - D:\JL_Client/data_execl/base_data\PassiveSkillLogicConfig.xlsx + - D:\JL_Client/data_execl/base_data\RechargeCommodityConfig.xlsx + - D:\JL_Client/data_execl/base_data\RaceTowerRewardConfig.xlsx - D:\JL_Client/data_execl/base_data\SkillConfig.xlsx - D:\JL_Client/data_execl/base_data\EventPointConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialConfig.xlsx - - D:\JL_Client/data_execl/base_data\SkillLogicConfig.xlsx + - D:\JL_Client/data_execl/base_data\PassiveSkillLogicConfig.xlsx - D:\JL_Client/data_execl/base_data\WorkShopTechnology.xlsx - - D:\JL_Client/data_execl/base_data\EquipTalismana.xlsx - D:\JL_Client/data_execl/base_data\StoreConfig.xlsx + - D:\JL_Client/data_execl/base_data\GuildTechnology.xlsx - D:\JL_Client/data_execl/base_data\OptionConfig.xlsx + - D:\JL_Client/data_execl/base_data\SkillLogicConfig.xlsx - D:\JL_Client/data_execl/base_data\RewardGroup.xlsx + - D:\JL_Client/data_execl/base_data\EquipTalismana.xlsx - D:\JL_Client/data_execl/base_data\MonsterGroup.xlsx - D:\JL_Client/data_execl/base_data\MainLevelConfig.xlsx - D:\JL_Client/data_execl/base_data\MonsterConfig.xlsx _values: - - 1169654203 - - 1240442055 - - 527608228 - - 3798417120 - - 903221398 - - 249002466 - - 4055477448 - - 613479935 - - 2050621784 - - 3943131728 - - 494399256 - - 173728414 - - 3548626589 - - 3507522218 - - 3591751192 - - 1774803500 - - 1924824445 - - 3687567707 - - 3347320787 - - 413963702 - - 755222564 - - 3079207713 - - 230994945 - - 4124958540 - - 3252026258 - - 2605131572 - 309514008 - - 368579360 - - 732833747 - - 2445182985 - - 3102098770 - - 2131302457 - - 475620184 - - 1468913191 + - 230994945 + - 1169654203 + - 3798417120 + - 4055477448 - 3755728772 - - 3585263874 - - 3153364400 - - 427098595 - - 460607005 + - 3507522218 + - 249002466 + - 527608228 + - 1240442055 + - 903221398 + - 3252026258 + - 2050621784 - 1300967772 - - 2296996310 - - 2031449552 - - 2759035733 - - 1572157444 - - 2405263382 - - 932779961 - - 2568046174 - - 3153107712 - - 3033812632 - 564908116 - - 1565259591 - - 3621447502 - - 243491956 - - 4198004043 - - 1705732776 - - 2264269610 - - 425543864 - - 1402356663 - - 571396712 - - 3442665542 - - 4243693008 - - 3472737567 - - 2048030774 - - 3449935329 - - 3754433465 - - 3682513624 - - 2479323017 - - 295715991 - - 2748321716 - - 3746847302 - - 568553271 - - 2903827109 - - 1445024159 - - 1393544882 - - 15839083 - - 2043460280 - - 1155516420 - - 515856748 - - 3935903312 - - 3597116301 - - 727009153 - - 1493914227 - - 1924994647 - - 312894044 - - 3625815197 - - 3089114090 - - 3226994303 - - 583891024 - - 1442255327 - - 1448464981 - - 1996735664 + - 1924824445 + - 732833747 + - 3591751192 + - 2131302457 - 1048362391 + - 613479935 + - 3102098770 + - 413963702 + - 2296996310 + - 755222564 + - 2759035733 + - 494399256 + - 353142748 + - 2605131572 + - 1705732776 + - 3687567707 + - 3548626589 + - 3517900411 + - 3347320787 + - 2031449552 + - 2568046174 + - 583891024 + - 4124958540 + - 1448464981 - 2294226303 - - 1848421159 - - 294734179 + - 1572157444 + - 932779961 + - 3442665542 + - 427098595 + - 1790592577 + - 96387668 + - 1774803500 + - 1791256076 - 1180842953 - 1023901955 - - 575711055 - - 297530923 - - 3705022903 - - 683415129 - - 2534897219 - - 3057223962 - - 593418072 - - 1790592577 - - 3517900411 - - 3894020600 - - 636689279 - - 1791256076 - - 3911391710 - - 1162865092 - - 804383039 - - 1786980484 - - 3674283409 - - 353142748 - - 911577538 - - 4216580883 - - 1510460150 - - 997936101 - - 739739032 - - 1218957739 - - 160427834 - 1382260277 - - 2842862470 - - 2854113790 - - 1843296992 + - 1442255327 - 1431560737 - - 3641128642 - - 4177681514 - - 933632842 - - 2867634862 - - 1511816098 - - 2656593449 - - 1513554725 - - 2777840995 - - 2405621183 - - 3951547032 - - 319164499 - - 1115488926 - - 98336120 - - 2769353865 - - 811712663 - - 3561388971 - - 967064327 - - 4291486445 - - 290493121 - - 277486271 - - 625696080 - - 1982645928 - - 38983593 + - 3033812632 + - 1468913191 + - 3079207713 + - 3153107712 + - 460607005 + - 1565259591 + - 4198004043 + - 368579360 + - 3226994303 + - 3472737567 + - 3585263874 + - 727009153 + - 4243693008 + - 2043460280 + - 1786980484 + - 1510460150 + - 3597116301 + - 243491956 + - 2479323017 + - 425543864 + - 1493914227 + - 3754433465 + - 1218957739 + - 3943131728 + - 3705022903 + - 2405263382 + - 683415129 + - 1996735664 + - 3682513624 + - 2445182985 + - 515856748 + - 1155516420 + - 160427834 + - 804383039 + - 2748321716 + - 3911391710 - 1952787401 - - 241982493 - - 3048495520 - - 3663717884 + - 2048030774 + - 575711055 + - 319164499 + - 297530923 + - 4291486445 + - 2534897219 + - 3951547032 + - 3621447502 + - 475620184 + - 2264269610 + - 593418072 + - 1848421159 + - 2903827109 + - 1115488926 + - 3894020600 + - 3449935329 + - 1402356663 + - 2241788502 + - 571396712 + - 3625815197 + - 3746847302 + - 568553271 + - 173728414 + - 3153364400 + - 636689279 + - 1393544882 + - 1982645928 + - 739739032 - 898095515 - - 110435588 + - 2769353865 + - 2854113790 + - 98336120 + - 241982493 + - 2405621183 + - 2777840995 + - 3048495520 - 2606088806 - - 98570907 + - 110435588 + - 811712663 + - 967064327 + - 3663717884 + - 625696080 + - 911577538 + - 3641128642 + - 3561388971 + - 3935903312 + - 1513554725 + - 1924994647 + - 1883225876 + - 3509406354 + - 3014861588 + - 3057223962 + - 2656593449 + - 215828471 + - 295715991 + - 3255901169 + - 1445024159 - 980629513 - - 491951589 + - 277486271 + - 15839083 + - 1799057366 + - 2135971531 + - 933632842 + - 2485935877 + - 2867634862 + - 294734179 + - 38983593 + - 1162865092 + - 98570907 + - 1843296992 + - 2827033665 - 2162791513 - 2343409024 - - 3014861588 - - 3255901169 - - 3509406354 - - 3036639695 + - 491951589 - 2453679101 - - 2362342209 - 2884272101 + - 312894044 - 1704981563 + - 3036639695 - 390613341 + - 2362342209 - 2594442567 - 1397243523 - - 1488525775 + - 3552053523 diff --git a/data_execl/base_data/StoreTypeConfig.xlsx b/data_execl/base_data/StoreTypeConfig.xlsx index b1d48af2a6..28e4edc2d9 100644 Binary files a/data_execl/base_data/StoreTypeConfig.xlsx and b/data_execl/base_data/StoreTypeConfig.xlsx differ