From f3a9fd3116a0bb45b8fa0927bca3be3efdd07358 Mon Sep 17 00:00:00 2001 From: "SD-20250424WZPW\\Administrator" Date: Tue, 29 Apr 2025 17:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=90=E8=B4=A8=E7=90=83?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ZQDN/FX/Maerials => Materials}/JDT01.mat | 0 .../FX/Maerials => Materials}/JDT01.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT02.mat | 0 .../FX/Maerials => Materials}/JDT02.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT03.mat | 0 .../FX/Maerials => Materials}/JDT03.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT04.mat | 0 .../FX/Maerials => Materials}/JDT04.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT05.mat | 0 .../FX/Maerials => Materials}/JDT05.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT06.mat | 0 .../FX/Maerials => Materials}/JDT06.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT07.mat | 0 .../FX/Maerials => Materials}/JDT07.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT08.mat | 0 .../FX/Maerials => Materials}/JDT08.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT09.mat | 0 .../FX/Maerials => Materials}/JDT09.mat.meta | 0 .../{ZQDN/FX/Maerials => Materials}/JDT10.mat | 0 .../FX/Maerials => Materials}/JDT10.mat.meta | 0 .../Assets/AssetRaw/UI/UIGameBattle.prefab | 12 +- .../AssetRaw/ZQDN/texture/001/01/017.png.meta | 114 ++++++++++++++++++ .../HotFix/GameLogic/Actor/ActorHItem.cs | 1 + .../UserSettings/EditorUserSettings.asset | 4 +- 24 files changed, 123 insertions(+), 8 deletions(-) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT01.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT01.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT02.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT02.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT03.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT03.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT04.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT04.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT05.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT05.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT06.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT06.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT07.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT07.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT08.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT08.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT09.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT09.mat.meta (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT10.mat (100%) rename UnityProject/Assets/AssetRaw/{ZQDN/FX/Maerials => Materials}/JDT10.mat.meta (100%) create mode 100644 UnityProject/Assets/AssetRaw/ZQDN/texture/001/01/017.png.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT01.mat b/UnityProject/Assets/AssetRaw/Materials/JDT01.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT01.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT01.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT01.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT01.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT01.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT01.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT02.mat b/UnityProject/Assets/AssetRaw/Materials/JDT02.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT02.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT02.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT02.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT02.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT02.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT02.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT03.mat b/UnityProject/Assets/AssetRaw/Materials/JDT03.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT03.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT03.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT03.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT03.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT03.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT03.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT04.mat b/UnityProject/Assets/AssetRaw/Materials/JDT04.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT04.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT04.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT04.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT04.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT04.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT04.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT05.mat b/UnityProject/Assets/AssetRaw/Materials/JDT05.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT05.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT05.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT05.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT05.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT05.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT05.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT06.mat b/UnityProject/Assets/AssetRaw/Materials/JDT06.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT06.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT06.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT06.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT06.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT06.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT06.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT07.mat b/UnityProject/Assets/AssetRaw/Materials/JDT07.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT07.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT07.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT07.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT07.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT07.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT07.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT08.mat b/UnityProject/Assets/AssetRaw/Materials/JDT08.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT08.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT08.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT08.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT08.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT08.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT08.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT09.mat b/UnityProject/Assets/AssetRaw/Materials/JDT09.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT09.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT09.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT09.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT09.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT09.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT09.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT10.mat b/UnityProject/Assets/AssetRaw/Materials/JDT10.mat similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT10.mat rename to UnityProject/Assets/AssetRaw/Materials/JDT10.mat diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT10.mat.meta b/UnityProject/Assets/AssetRaw/Materials/JDT10.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/JDT10.mat.meta rename to UnityProject/Assets/AssetRaw/Materials/JDT10.mat.meta diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index d2c77ce4..6c6f3ea2 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -742,10 +742,10 @@ RectTransform: - {fileID: 3547666515304448482} m_Father: {fileID: 7323484200357829197} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5, y: -21.5} - m_SizeDelta: {x: 31, y: 31} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5164661564043509363 CanvasRenderer: @@ -945,7 +945,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: e30775360822393489dcfd82d20f3149, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1498,7 +1498,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1950349943801813264 RectTransform: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/texture/001/01/017.png.meta b/UnityProject/Assets/AssetRaw/ZQDN/texture/001/01/017.png.meta new file mode 100644 index 00000000..d2396611 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/ZQDN/texture/001/01/017.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 39f23d814ea1d384489edf498a7f1e02 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 39d2448f..c8c9ff53 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -57,6 +57,7 @@ namespace GameLogic m_imgSign.sprite = GameModule.Resource.LoadAsset("zjm_mz_" + assetsId); m_imgValue.sprite = GameModule.Resource.LoadAsset("zjm_jdt_" + assetsId); + m_imgValue.material = GameModule.Resource.LoadAsset("JDT" + (assetsId <= 10 ? "0" + assetsId : assetsId)); m_tmpSign.text = DataGameSceneManager.Instance.m_Strs[i]; m_tmpAllValue.text = m_AllPush.ToString(); } diff --git a/UnityProject/UserSettings/EditorUserSettings.asset b/UnityProject/UserSettings/EditorUserSettings.asset index d2bd0d7d..711f16ce 100644 --- a/UnityProject/UserSettings/EditorUserSettings.asset +++ b/UnityProject/UserSettings/EditorUserSettings.asset @@ -36,13 +36,13 @@ EditorUserSettings: value: 55570c0506015f0e08595d7043205944401641792f2b77682b7b4963e4e5323c flags: 0 UnityEditor.ShaderGraph.Blackboard: - value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 + value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf flags: 0 UnityEditor.ShaderGraph.FloatingWindowsLayout2: value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf flags: 0 UnityEditor.ShaderGraph.InspectorWindow: - value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf + value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828691f0beb6fdd1cbfceba0b9f0b3bed8e8f5ade1ff8c978883d3f59e9e919c89eacfcc flags: 0 vcSharedLogLevel: value: 0d5e400f0650