From 04ec7bc8d2b4492aee9dea766922d047cb4c61b1 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 07 十一月 2025 14:22:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Config/BattleMap.txt | 2
/dev/null | 114 ---------------------------------------------------------
Texture/FullScreenBg/mainui_img_04.jpg | 0
Texture/FullScreenBg/mainui_img_10.jpg | 0
4 files changed, 1 insertions(+), 115 deletions(-)
diff --git a/Config/BattleMap.txt b/Config/BattleMap.txt
index 253ca90..20c55df 100644
--- a/Config/BattleMap.txt
+++ b/Config/BattleMap.txt
@@ -4,5 +4,5 @@
1 涓荤嚎灏忓叧 0
2 涓荤嚎Boss 1
3 婕旀鍦� mainui_img_07 0
-30010 鐧介鑽掗噹 mainui_img_02 1
+30010 鐧介鑽掗噹 mainui_img_10 1
30020 澶╁瓙鐨勮�冮獙 mainui_img_09 1
diff --git a/Texture/FullScreenBg/mainui_img_04.jpg b/Texture/FullScreenBg/mainui_img_04.jpg
index 243653c..2e19c78 100644
--- a/Texture/FullScreenBg/mainui_img_04.jpg
+++ b/Texture/FullScreenBg/mainui_img_04.jpg
Binary files differ
diff --git a/Texture/FullScreenBg/mainui_img_04.jpg.meta b/Texture/FullScreenBg/mainui_img_04.jpg.meta
deleted file mode 100644
index 5a368aa..0000000
--- a/Texture/FullScreenBg/mainui_img_04.jpg.meta
+++ /dev/null
@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: c3fed0435b49e904f86289e5f7f52978
-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
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Texture/FullScreenBg/mainui_img_10.jpg b/Texture/FullScreenBg/mainui_img_10.jpg
new file mode 100644
index 0000000..ca28fc5
--- /dev/null
+++ b/Texture/FullScreenBg/mainui_img_10.jpg
Binary files differ
--
Gitblit v1.8.0