浏览代码

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

李桃 3 天之前
父节点
当前提交
b91f1a30e6

+ 14 - 0
Assets/Res/UI/DivineSence/神识探索.png.meta

@@ -168,6 +168,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: []

+ 14 - 0
Assets/Res/UI/通用提示.png.meta

@@ -168,6 +168,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: []

+ 8 - 0
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -36,6 +36,14 @@ Material:
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainText:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - unity_Lightmaps:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

文件差异内容过多而无法显示
+ 929 - 33
Assets/Resources/Shader/ShengShiShader.shadergraph


+ 3 - 3
Assets/Scenes/testCombat.scene

@@ -2253,7 +2253,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 150
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 9002
+      value: 5001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2353,7 +2353,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 3 - 1
Assets/Scripts/ThirdParty/Fort23.ThirdParty.asmdef

@@ -5,7 +5,9 @@
         "GUID:05dbf8cd246c9274c8a78a65142e5f8a",
         "GUID:bcc75752368a72b4aba4043ea13b2a1a",
         "GUID:343deaaf83e0cee4ca978e7df0b80d21",
-        "GUID:2bafac87e7f4b9b418d9448d219b01ab"
+        "GUID:2bafac87e7f4b9b418d9448d219b01ab",
+        "GUID:df380645f10b7bc4b97d4f5eb6303d95",
+        "GUID:15fc0a57446b3144c949da3e2b9737a9"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 8 - 0
Assets/Scripts/ThirdParty/URPTool.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XXMXsCj+VHuxb8eDuG0jf5CLvrGVMXtvhmQLBxesbmZWwjuRLotwnIkLbNeS
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 111 - 0
Assets/Scripts/ThirdParty/URPTool/Blit.cs

@@ -0,0 +1,111 @@
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+ 
+// Saved in Blit.cs
+public class Blit : ScriptableRendererFeature {
+ 
+    public class BlitPass : ScriptableRenderPass {
+        public enum RenderTarget {
+            Color,
+            RenderTexture,
+        }
+ 
+        public Material blitMaterial = null;
+        public int blitShaderPassIndex = 0;
+        public FilterMode filterMode { get; set; }
+ 
+        private RenderTargetIdentifier source { get; set; }
+        private RenderTargetHandle destination { get; set; }
+ 
+        RenderTargetHandle m_TemporaryColorTexture;
+        string m_ProfilerTag;
+         
+        public BlitPass(RenderPassEvent renderPassEvent, Material blitMaterial, int blitShaderPassIndex, string tag) {
+            this.renderPassEvent = renderPassEvent;
+            this.blitMaterial = blitMaterial;
+            this.blitShaderPassIndex = blitShaderPassIndex;
+            m_ProfilerTag = tag;
+            m_TemporaryColorTexture.Init("_TemporaryColorTexture");
+        }
+         
+        public void Setup(RenderTargetIdentifier source, RenderTargetHandle destination) {
+            this.source = source;
+            this.destination = destination;
+        }
+         
+        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) {
+            CommandBuffer cmd = CommandBufferPool.Get(m_ProfilerTag);
+ 
+            RenderTextureDescriptor opaqueDesc = renderingData.cameraData.cameraTargetDescriptor;
+            opaqueDesc.depthBufferBits = 0;
+ 
+            // Can't read and write to same color target, use a TemporaryRT
+            if (destination == RenderTargetHandle.CameraTarget) {
+                cmd.GetTemporaryRT(m_TemporaryColorTexture.id, opaqueDesc, filterMode);
+                Blit(cmd, source, m_TemporaryColorTexture.Identifier(), blitMaterial, blitShaderPassIndex);
+                Blit(cmd, m_TemporaryColorTexture.Identifier(), source);
+            } else {
+                Blit(cmd, source, destination.Identifier(), blitMaterial, blitShaderPassIndex);
+            }
+ 
+            context.ExecuteCommandBuffer(cmd);
+            CommandBufferPool.Release(cmd);
+        }
+         
+        public override void FrameCleanup(CommandBuffer cmd) {
+            if (destination == RenderTargetHandle.CameraTarget)
+                cmd.ReleaseTemporaryRT(m_TemporaryColorTexture.id);
+        }
+    }
+ 
+    [System.Serializable]
+    public class BlitSettings {
+        public RenderPassEvent Event = RenderPassEvent.AfterRenderingOpaques;
+ 
+        public Material blitMaterial = null;
+        public int blitMaterialPassIndex = -1;
+        public Target destination = Target.Color;
+        public string textureId = "_BlitPassTexture";
+    }
+ 
+    public enum Target {
+        Color,
+        Texture
+    }
+ 
+    public BlitSettings settings = new BlitSettings();
+    RenderTargetHandle m_RenderTextureHandle;
+ 
+    BlitPass blitPass;
+ 
+    public override void Create() {
+        var passIndex = settings.blitMaterial != null ? settings.blitMaterial.passCount - 1 : 1;
+        settings.blitMaterialPassIndex = Mathf.Clamp(settings.blitMaterialPassIndex, -1, passIndex);
+        blitPass = new BlitPass(settings.Event, settings.blitMaterial, settings.blitMaterialPassIndex, name);
+        m_RenderTextureHandle.Init(settings.textureId);
+    }
+
+    public override void SetupRenderPasses(ScriptableRenderer renderer, in RenderingData renderingData)
+    {
+        var src = renderer.cameraColorTargetHandle;
+        var dest = (settings.destination == Target.Color) ? RenderTargetHandle.CameraTarget : m_RenderTextureHandle;
+        blitPass.Setup(src, dest);
+    }
+
+    public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) {
+      
+ 
+        if (settings.blitMaterial == null) {
+            Debug.LogWarningFormat("Missing Blit Material. {0} blit pass will not execute. Check for missing reference in the assigned renderer.", GetType().Name);
+            return;
+        }
+
+        if (!renderingData.cameraData.camera.tag.Equals("MainCamera"))
+        {
+            return;
+        }
+
+        renderer.EnqueuePass(blitPass);
+    }
+}

+ 11 - 0
Assets/Scripts/ThirdParty/URPTool/Blit.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Wnoc53j7BSoQwXiV4/qzVJHsClcEy+yGljkT9BtZXqVB+uCB6FuPXM73TmhK
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 21 - 1
Assets/Settings/rpAsset_Renderer.asset

@@ -1,5 +1,24 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-3260757889090043925
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e03bbffa856b4d149b49c5ff90f72fb6, type: 3}
+  m_Name: Blit
+  m_EditorClassIdentifier: 
+  m_Active: 0
+  settings:
+    Event: 500
+    blitMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
+    blitMaterialPassIndex: 0
+    destination: 0
+    textureId: _BlitPassTexture
 --- !u!114 &-1306005803540324591
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -32,7 +51,8 @@ MonoBehaviour:
   m_RendererFeatures:
   - {fileID: 8096991511476621891}
   - {fileID: -1306005803540324591}
-  m_RendererFeatureMap: 43d2ea46e14a5e70115f6125a422e0ed
+  - {fileID: -3260757889090043925}
+  m_RendererFeatureMap: 43d2ea46e14a5e70115f6125a422e0edeb3f3ce2f975bfd2
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}

二进制
Excel2Json/Excel/skill.xlsx


部分文件因为文件数量过多而无法显示