From d8a8e4329f87feda27bf9222ef90e4ba3df2941f Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 16 十月 2026 15:27:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Sprite/Soul/Soul_img_701.png.meta | 153 +++++++++++++++++++++++++
Sprite/Soul.spriteatlasv2 | 2
UI/SoulWin.prefab | 14 +-
Config/TreasureSet.txt | 2
Sprite/Soul/Soul_img_701.png | 0
Sprite/Soul/Soul_img_700.png.meta | 153 +++++++++++++++++++++++++
Sprite/Soul/Soul_img_700.png | 0
7 files changed, 316 insertions(+), 8 deletions(-)
diff --git a/Config/TreasureSet.txt b/Config/TreasureSet.txt
index b8a6b2c..d1f0b53 100644
--- a/Config/TreasureSet.txt
+++ b/Config/TreasureSet.txt
@@ -2,7 +2,7 @@
TreasureType CheckPackList DailyMaxCount DailyMaxCountMoney DailyFreeCount TreasureCountList CostItemID CostItemCountList CostMoneyType CostMoneyList EnsureCount OnceLucky LuckyGridNum GridNumMaxLimitInfo AwardMoneyType AwardMoneyValue WishOpen WishReset WishLibSelect WishLibPubFreeCnt WishLibCard ProbabilityDisplay
瀵诲疂绫诲瀷 妫�鏌ヨ儗鍖呯被鍨嬪垪琛� 姣忔棩鏈�澶ф鏁� 姣忔棩璐у竵娆℃暟 姣忔棩鍏嶈垂娆℃暟 鎶藉娆℃暟鍒楄〃 娑堣�楅亾鍏稩D 娑堣�椾釜鏁板垪琛� 娑堣�楄揣甯佺被鍨� 娑堣�楄揣甯佸垪琛� 姣弜娆″繀鍑� 鍗曟骞歌繍鍊� 骞歌繍鏍煎瓙缂栧彿 鏍煎瓙鏈�澶т骇鍑烘鏁伴檺鍒� 棰濆鑾峰緱璐у竵绫诲瀷 鍗曟濂栧姳璐у竵鏁� 蹇冩効寮�鍚潯浠� 蹇冩効閲嶇疆瑙勫垯 蹇冩効搴撻�夋嫨鏁� 蹇冩効搴撳叕鍏卞厤璐规鏁� 鍏叡娆℃暟蹇冩効鍗� 瀹㈡埛绔鐜囧睍绀猴紙涓嶅悓鍔熻兘瑙勫垯涓嶅悓锛�
5 2 99999 0 1 [1, 10] 20 [1, 10] 1 [200, 2000] 0 1 5 {} 0 0 0 {} {} {}
-6 2 99999 0 1 [1, 5] 50 [1, 5] 1 [200, 1000] 0 1 9 {} 0 0 0 {} {} {}
+6 2 99999 0 1 [1, 5] 50 [1, 5] 0 [] 0 1 9 {} 0 0 0 {} {} {}
12 35 99999 0 3 [1, 10] 5 [1, 10] 1 [280, 2800] 0 1 5 {} 0 0 99 1 {"104":1, "105":1} {"104":1, "105":1} {"104":25, "105":26}
13 35 99999 0 0 [1, 10] 0 [] 51 [1000] 0 0 0 {} 0 0 0 {} {} {}
100 2|35 0 20 0 [1, 10] 501 [1, 10] 1 [300, 3000] 0 1 1 {} 0 0 0 {} {} {}
diff --git a/Sprite/Soul.spriteatlasv2 b/Sprite/Soul.spriteatlasv2
index b766fbc..46cca97 100644
--- a/Sprite/Soul.spriteatlasv2
+++ b/Sprite/Soul.spriteatlasv2
@@ -73,4 +73,6 @@
- {fileID: 2800000, guid: 47b51173ed2b0b94e83cbfab75e82c36, type: 3}
- {fileID: 2800000, guid: e0e7001472414c84387f3b4b05371a61, type: 3}
- {fileID: 2800000, guid: e14a71acd50435f47b7899d0b46ee465, type: 3}
+ - {fileID: 2800000, guid: f80115701edad6e479f17b0a007899ff, type: 3}
+ - {fileID: 2800000, guid: 0a581d376e481554fa654b11b015e2df, type: 3}
m_IsVariant: 0
diff --git a/Sprite/Soul/Soul_img_700.png b/Sprite/Soul/Soul_img_700.png
new file mode 100644
index 0000000..971e5af
--- /dev/null
+++ b/Sprite/Soul/Soul_img_700.png
Binary files differ
diff --git a/Sprite/Soul/Soul_img_700.png.meta b/Sprite/Soul/Soul_img_700.png.meta
new file mode 100644
index 0000000..e59f16c
--- /dev/null
+++ b/Sprite/Soul/Soul_img_700.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: f80115701edad6e479f17b0a007899ff
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 13
+ 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
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ 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
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName: ui/sprite/soul
+ assetBundleVariant:
diff --git a/Sprite/Soul/Soul_img_701.png b/Sprite/Soul/Soul_img_701.png
new file mode 100644
index 0000000..e7f6b11
--- /dev/null
+++ b/Sprite/Soul/Soul_img_701.png
Binary files differ
diff --git a/Sprite/Soul/Soul_img_701.png.meta b/Sprite/Soul/Soul_img_701.png.meta
new file mode 100644
index 0000000..4ca2712
--- /dev/null
+++ b/Sprite/Soul/Soul_img_701.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 0a581d376e481554fa654b11b015e2df
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 13
+ 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
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ 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
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName: ui/sprite/soul
+ assetBundleVariant:
diff --git a/UI/SoulWin.prefab b/UI/SoulWin.prefab
index f0ebb6c..04da32e 100644
--- a/UI/SoulWin.prefab
+++ b/UI/SoulWin.prefab
@@ -3442,8 +3442,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 311, y: -16.5}
- m_SizeDelta: {x: 93, y: 32}
+ m_AnchoredPosition: {x: 324.3, y: -23}
+ m_SizeDelta: {x: 41, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5466223469523049898
MonoBehaviour:
@@ -5985,7 +5985,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5115540453702661610}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -5995,7 +5995,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 93, y: 32}
+ m_SizeDelta: {x: 41, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &70100301382321930
CanvasRenderer:
@@ -6025,7 +6025,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 03a40853fd0e02449864b9478afb1d6e, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f80115701edad6e479f17b0a007899ff, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -9323,7 +9323,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 93, y: 32}
+ m_SizeDelta: {x: 41, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1407918544959143774
CanvasRenderer:
@@ -9353,7 +9353,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: be3127ee9b58f8549bd87b8f226d979f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 0a581d376e481554fa654b11b015e2df, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
--
Gitblit v1.8.0