DESKTOP-FB72PO8\Administrator преди 2 дни
родител
ревизия
b018f4f7c7

+ 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}

BIN
Excel2Json/Excel/skill.xlsx


+ 11 - 11
UserSettings/EditorUserSettings.asset

@@ -21,31 +21,31 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
+      value: 540250560006580f5d0d597544775944444f4e2e7e2c71367f2b4b31b4b8626d
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 540250560006580f5d0d597544775944444f4e2e7e2c71367f2b4b31b4b8626d
+      value: 5506075403000c0f585c0a2113700e44144e407d2e797e6575784f65b4b0673c
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5506075403000c0f585c0a2113700e44144e407d2e797e6575784f65b4b0673c
+      value: 515700535051580855590f2745765e44104e1c7f782d74362b784e60bbe3353e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 515700535051580855590f2745765e44104e1c7f782d74362b784e60bbe3353e
+      value: 000600575306590e5d575d7545225d44434e1c2f2e2a72337a7a1c32e6e4663b
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 000600575306590e5d575d7545225d44434e1c2f2e2a72337a7a1c32e6e4663b
+      value: 0654575100065d5f5e0f0f2113200a444f161e737f7e25667d2c4563bab8306c
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0654575100065d5f5e0f0f2113200a444f161e737f7e25667d2c4563bab8306c
+      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
+      value: 0150505250015d080b0d5e2645725e444e1540722d78236075714b6ab2b5323d
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
@@ -54,13 +54,13 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b58f908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bac5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b58f908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828791f0beb6fdd1cbfceba0b9f0b3bed8e8f5ade6fb8c978883d3f59e98909c89eacfcc
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828f91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ade6fb8c978883d3f59e98909c89eacfcc
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1

Някои файлове не бяха показани, защото твърде много файлове са промени