diff options
| author | chai <215380520@qq.com> | 2024-04-18 17:18:33 +0800 |
|---|---|---|
| committer | chai <215380520@qq.com> | 2024-04-18 17:18:33 +0800 |
| commit | eda94b6bf95a7eea5b85dff615048bc7a05de8d6 (patch) | |
| tree | 602766780da303ebfdff75710a54b0e6bac949e3 | |
| parent | c56748bc8ef6e02ae2f1f49cde06ef1b94383875 (diff) | |
* namespace RK
57 files changed, 1624 insertions, 1252 deletions
diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_01_A.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_01_A.mat index bd01876..0aa036d 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_01_A.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_01_A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FantasyRivals_01_A m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_02_A.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_02_A.mat index e43ee96..0cf8423 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_02_A.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_02_A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FantasyRivals_02_A m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,7 +62,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7b263225b92b7dd449e610efd1a314a0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -93,7 +96,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -116,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_03_A.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_03_A.mat index 800dcbb..50ff875 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_03_A.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_03_A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FantasyRivals_03_A m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,7 +62,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 86c8d46d6fdb1284d9c2b32cb6322525, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -93,7 +96,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -116,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_04_A.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_04_A.mat index 8b896c1..b64f20f 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_04_A.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_04_A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FantasyRivals_04_A m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,7 +62,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b8124f7f62bf00e43982bf5751cbb79d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -93,7 +96,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -116,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_MysticArms.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_MysticArms.mat index 1956c19..4556b1b 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_MysticArms.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_MysticArms.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FantasyRivals_MysticArms m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - _SPECULAR_SETUP @@ -23,6 +25,8 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly + - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -51,7 +55,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d977955b25c73694fa4057a9323e4b2b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -85,7 +89,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -94,6 +100,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -108,13 +115,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 0 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.878} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.878} - _EmissionColor: {r: 0.74264705, g: 0.49680528, b: 0.18566176, a: 1} - _SpecColor: {r: 0.5588235, g: 0.5300605, b: 0.5300605, a: 1} m_BuildTextureStacks: [] @@ -130,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_SpiritDemon.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_SpiritDemon.mat index 474a863..14b781e 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_SpiritDemon.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/Materials/FantasyRivals_SpiritDemon.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FantasyRivals_SpiritDemon m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT @@ -21,6 +23,8 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly + - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -49,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d977955b25c73694fa4057a9323e4b2b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -83,7 +87,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -92,6 +98,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -106,13 +113,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -128,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/_Demo/Ground.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/_Demo/Ground.mat index 31377ec..e948e5a 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/_Demo/Ground.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Lowpoly/characters/_Demo/Ground.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Ground m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -80,7 +83,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -103,13 +109,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8308824, g: 0.8308824, b: 0.8308824, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.8308824, g: 0.8308824, b: 0.8308824, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -125,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyArtMaskTint01.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyArtMaskTint01.mat index 0eb5ab0..8a5af0f 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyArtMaskTint01.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyArtMaskTint01.mat @@ -10,6 +10,8 @@ Material: m_Name: PolyArtMaskTint01 m_Shader: {fileID: -6465566751694194690, guid: 55ef4a6d07efda74e8b8d8ca097ecdda, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,4 +105,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyartStandard.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyartStandard.mat index 0a2678b..f594f37 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyartStandard.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/PolyartStandard.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PolyartStandard m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -125,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage1.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage1.mat index 9ac60ab..c4822e6 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage1.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stage1 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SPECULAR_SETUP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage2.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage2.mat index 23d35c0..a688369 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage2.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stage2 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SPECULAR_SETUP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage3.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage3.mat index f92c2eb..e68fa04 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage3.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage3.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stage3 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SPECULAR_SETUP m_InvalidKeywords: [] @@ -19,6 +21,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage4.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage4.mat index 84b6193..c3d7958 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage4.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stage4 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SPECULAR_SETUP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage5.mat b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage5.mat index 1bdd60a..c58b1c1 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage5.mat +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/CommonMaterialsShaders/Stage5.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stage5 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SPECULAR_SETUP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/Scenes/URPsettings/UniversalRP-HighQuality.asset b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/Scenes/URPsettings/UniversalRP-HighQuality.asset index ed9c339..c4d02ab 100644 --- a/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/Scenes/URPsettings/UniversalRP-HighQuality.asset +++ b/RogueKnights/RogueKnights/Assets/Art/Vendors/Mini Legions Fantasy Polyart/Scenes/URPsettings/UniversalRP-HighQuality.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRP-HighQuality m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 4 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 @@ -54,22 +57,58 @@ MonoBehaviour: m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 64 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 1 diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Blocks/ChunkFastBuilder.cs b/RogueKnights/RogueKnights/Assets/Scripts/Blocks/ChunkFastBuilder.cs index 438240c..b0fc00e 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Blocks/ChunkFastBuilder.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Blocks/ChunkFastBuilder.cs @@ -3,46 +3,50 @@ using System.Collections.Generic; using UnityEditor.Search; using UnityEngine; -[ExecuteInEditMode] -public class ChunkFastBuilder : SingletonMB<ChunkFastBuilder> +namespace RK { - public GameObject[] blocks; + [ExecuteInEditMode] + public class ChunkFastBuilder : SingletonMB<ChunkFastBuilder> + { + public GameObject[] blocks; - public GameObject BuildChunk(int[] seq, int row, int colum) - { - if (seq.Length != colum * row) - { - return null; - } - GameObject chunk = new GameObject(); - for(int r = 0; r < row; ++r) + public GameObject BuildChunk(int[] seq, int row, int colum) { - for(int c = 0; c < colum; ++c) + if (seq.Length != colum * row) { - int block = seq[c + r * colum]; + return null; + } + + GameObject chunk = new GameObject(); + for (int r = 0; r < row; ++r) + { + for (int c = 0; c < colum; ++c) + { + int block = seq[c + r * colum]; - GameObject go = GameObject.Instantiate(blocks[block], chunk.transform); - go.transform.localPosition = new Vector3(0.5f + r, 0, 0.5f + c); + GameObject go = GameObject.Instantiate(blocks[block], chunk.transform); + go.transform.localPosition = new Vector3(0.5f + r, 0, 0.5f + c); + } } - } - return chunk; - } + return chunk; + } - [ExecuteInEditMode] - private void OnGUI() - { - if(GUILayout.Button("")) + [ExecuteInEditMode] + private void OnGUI() { - BuildChunk(new int[] { + if (GUILayout.Button("")) + { + BuildChunk(new int[] { 1,1,1, 0,0,0, - 0,2,2 + 0,2,2 }, 3, 3); + } } - } -}
\ No newline at end of file + } +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/CameraController.cs b/RogueKnights/RogueKnights/Assets/Scripts/CameraController.cs index a58c9ff..b842c50 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/CameraController.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/CameraController.cs @@ -2,17 +2,22 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class CameraController : MonoBehaviour +namespace RK { - // Start is called before the first frame update - void Start() - { - - } - // Update is called once per frame - void Update() + public class CameraController : MonoBehaviour { - + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } } + } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonFunction.cs b/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonFunction.cs index b4de592..c58b138 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonFunction.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Common/CommonFunction.cs @@ -7,46 +7,51 @@ using System.IO; using UnityEngine; using System.Linq; -public static class CommonFunction +namespace RK { - public static void WriteFile(string content, string file) + public static class CommonFunction { - if(File.Exists(file)) - { - File.Delete(file); - } - string dir = Path.GetDirectoryName(file); - if(!Directory.Exists(dir)) + public static void WriteFile(string content, string file) { - Directory.CreateDirectory(dir); - } + if (File.Exists(file)) + { + File.Delete(file); + } - File.WriteAllText(file, content); - } + string dir = Path.GetDirectoryName(file); + if (!Directory.Exists(dir)) + { + Directory.CreateDirectory(dir); + } - public static Type GetTypeByName(string name) - { - foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Reverse()) + File.WriteAllText(file, content); + } + + public static Type GetTypeByName(string name) { - var tt = assembly.GetType(name); - if (tt != null) + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Reverse()) { - return tt; + var tt = assembly.GetType(name); + if (tt != null) + { + return tt; + } } + + return null; } - return null; - } + public static System.Object CreateInstance(string typeName) + { + Type t = GetTypeByName(typeName); + if (t == null) + return null; + var obj = Activator.CreateInstance(t); + return obj; + } - public static System.Object CreateInstance(string typeName) - { - Type t = GetTypeByName(typeName); - if (t == null) - return null; - var obj = Activator.CreateInstance(t); - return obj; } } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Common/Singleton.cs b/RogueKnights/RogueKnights/Assets/Scripts/Common/Singleton.cs index bb382e2..ecfbb5e 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Common/Singleton.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Common/Singleton.cs @@ -1,16 +1,20 @@ using System; -public class Singleton<T> where T : class, new() +namespace RK { - private static T _instance; - public static T Instance + public class Singleton<T> where T : class, new() { - get + private static T _instance; + + public static T Instance { - if (_instance == null) - _instance = Activator.CreateInstance<T>(); - return _instance; + get + { + if (_instance == null) + _instance = Activator.CreateInstance<T>(); + return _instance; + } } } -}
\ No newline at end of file +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs b/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs index ef6b3b4..0fc0778 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Common/SingletonMB.cs @@ -1,58 +1,62 @@ using UnityEngine; using RK; -public abstract class SingletonMB<T> : MonoBehaviour where T : class +namespace RK { - protected static T m_Instance; - public static T Instance + public abstract class SingletonMB<T> : MonoBehaviour where T : class { - get { return m_Instance; } - set + protected static T m_Instance; + + public static T Instance { - if (m_Instance != null) + get { return m_Instance; } + set { - throw new System.ApplicationException("An instance was created duplicate!"); - } + if (m_Instance != null) + { + throw new System.ApplicationException("An instance was created duplicate!"); + } - m_Instance = value; + m_Instance = value; + } } - } - - protected virtual void Awake() - { - //if (null != m_Instance) - //{ - // LogHelper.LogError(StringUtil.Concat("Exception: Duplicated Instance!! type is ", typeof(T).ToString(), ", plz send this error msg to hanjun!")); - //} - m_Instance = gameObject.GetComponent<T>(); - } - - /// <summary> - /// CN: 加这个函数是为了同一个GameObject挂了多个Manager类，再OnDestroy里设置自己的单例为null - /// </summary> - protected virtual void OnDestroy() - { - //m_Instance = null; - DoWhenOnDestroy(); - } - - protected virtual void DoWhenOnDestroy() - { + protected virtual void Awake() + { + //if (null != m_Instance) + //{ + // LogHelper.LogError(StringUtil.Concat("Exception: Duplicated Instance!! type is ", typeof(T).ToString(), ", plz send this error msg to hanjun!")); + //} - } + m_Instance = gameObject.GetComponent<T>(); + } - public void ReleaseInstance() - { - if (m_Instance != null) + /// <summary> + /// CN: 加这个函数是为了同一个GameObject挂了多个Manager类，再OnDestroy里设置自己的单例为null + /// </summary> + protected virtual void OnDestroy() { - UnityEngine.Object.Destroy(this.gameObject); //m_Instance = null; + DoWhenOnDestroy(); } - else + + protected virtual void DoWhenOnDestroy() { - LogHelper.LogError("m_Instance is already null!! type is " + typeof(T).ToString()); + + } + + public void ReleaseInstance() + { + if (m_Instance != null) + { + UnityEngine.Object.Destroy(this.gameObject); + //m_Instance = null; + } + else + { + LogHelper.LogError("m_Instance is already null!! type is " + typeof(T).ToString()); + } } } }
\ No newline at end of file diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Tools/CSVReader.cs b/RogueKnights/RogueKnights/Assets/Scripts/Tools/CSVReader.cs index 18930f5..07ce428 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Tools/CSVReader.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Tools/CSVReader.cs @@ -10,133 +10,138 @@ using UnityEngine; using yutokun; using static UnityEngine.Rendering.DebugUI; -public class CSVReader +namespace RK { - private static Dictionary<string/*key*/, int/*index*/> m_KeyMapping = new Dictionary<string, int>(); - private static List<List<string>> m_Rows = new List<List<string>>(); - /// <summary> - /// csvб - /// </summary> - /// <typeparam name="T"></typeparam> - /// <param name="content"></param> - /// <returns></returns> - public static List<T> Read<T>(string content) where T : new() + public class CSVReader { - List<T> result = new List<T>(); - Read<T>(result, content); - return result; - } - - /// <summary> - /// csv - /// </summary> - /// <typeparam name="T"></typeparam> - /// <param name="content"></param> - /// <returns></returns> - public static int Read<T>(List<T> target, string content) where T : new() - { - m_KeyMapping.Clear(); - m_Rows.Clear(); + private static Dictionary<string/*key*/, int/*index*/> m_KeyMapping = new Dictionary<string, int>(); + private static List<List<string>> m_Rows = new List<List<string>>(); - m_Rows = CSVParser.LoadFromString(content); - // һkey - List<string> keys = m_Rows[0]; - for (int i = 0; i < keys.Count; ++i) + /// <summary> + /// csvб + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="content"></param> + /// <returns></returns> + public static List<T> Read<T>(string content) where T : new() { - m_KeyMapping.Add(keys[i], i); + List<T> result = new List<T>(); + Read<T>(result, content); + return result; } - int count = 0; - Type type = typeof(T); - for (int i = 1; i < m_Rows.Count; ++i) + + /// <summary> + /// csv + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="content"></param> + /// <returns></returns> + public static int Read<T>(List<T> target, string content) where T : new() { - if (m_Rows[i] == null || m_Rows[i].Count == 0) // - continue; + m_KeyMapping.Clear(); + m_Rows.Clear(); - bool isBlank = true; - m_Rows[i].ForEach(s => { if (!string.IsNullOrEmpty(s)) isBlank = false; }); - if (isBlank) - continue; + m_Rows = CSVParser.LoadFromString(content); + // һkey + List<string> keys = m_Rows[0]; + for (int i = 0; i < keys.Count; ++i) + { + m_KeyMapping.Add(keys[i], i); + } + int count = 0; + Type type = typeof(T); + for (int i = 1; i < m_Rows.Count; ++i) + { + if (m_Rows[i] == null || m_Rows[i].Count == 0) // + continue; - if (m_Rows[i][0].Length > 0 && m_Rows[i][0][0] == '#') // ע - continue; + bool isBlank = true; + m_Rows[i].ForEach(s => { if (!string.IsNullOrEmpty(s)) isBlank = false; }); + if (isBlank) + continue; - List<string> row = m_Rows[i]; - T obj = new T(); - foreach (var key in m_KeyMapping) - { - int index = key.Value; - var fieldInfo = type.GetField(key.Key); - if (fieldInfo != null) + if (m_Rows[i][0].Length > 0 && m_Rows[i][0][0] == '#') // ע + continue; + + List<string> row = m_Rows[i]; + T obj = new T(); + foreach (var key in m_KeyMapping) { - Type fieldType = fieldInfo.FieldType; - if (fieldType.IsEnum) // ö٣תint - { - int value = int.Parse(row[index]); - fieldInfo.SetValue(obj, value); - } - else + int index = key.Value; + var fieldInfo = type.GetField(key.Key); + if (fieldInfo != null) { - fieldInfo.SetValue(obj, Convert.ChangeType(row[index], fieldInfo.FieldType)); + Type fieldType = fieldInfo.FieldType; + if (fieldType.IsEnum) // ö٣תint + { + int value = int.Parse(row[index]); + fieldInfo.SetValue(obj, value); + } + else + { + fieldInfo.SetValue(obj, Convert.ChangeType(row[index], fieldInfo.FieldType)); + } } } + target.Add(obj); + count++; } - target.Add(obj); - count++; + return count; } - return count; - } - /// <summary> - /// csvkey洢ֵ - /// </summary> - /// <typeparam name="TKey"></typeparam> - /// <typeparam name="TValue"></typeparam> - /// <param name="target"></param> - /// <param name="content"></param> - /// <param name="keyName"></param> - /// <returns></returns> - public static int ReadDictionary<TKey, TValue>(Dictionary<TKey, TValue> target, string content, string keyName) where TValue : new() - { - List<TValue> data = CSVReader.Read<TValue>(content); - if (data == null || data.Count == 0) - return 0; - Type type_key = typeof(TKey); - Type type_value = typeof(TValue); - FieldInfo field = type_value.GetField(keyName); - Type type_field = field.FieldType; - int count = 0; - for (int i = 0; i < data.Count; ++i) + /// <summary> + /// csvkey洢ֵ + /// </summary> + /// <typeparam name="TKey"></typeparam> + /// <typeparam name="TValue"></typeparam> + /// <param name="target"></param> + /// <param name="content"></param> + /// <param name="keyName"></param> + /// <returns></returns> + public static int ReadDictionary<TKey, TValue>(Dictionary<TKey, TValue> target, string content, string keyName) where TValue : new() { - TValue d = data[i]; - - TKey key = default(TKey); - if (type_key.IsEnum) + List<TValue> data = CSVReader.Read<TValue>(content); + if (data == null || data.Count == 0) + return 0; + Type type_key = typeof(TKey); + Type type_value = typeof(TValue); + FieldInfo field = type_value.GetField(keyName); + Type type_field = field.FieldType; + int count = 0; + for (int i = 0; i < data.Count; ++i) { - if(type_field == typeof(string)) + TValue d = data[i]; + + TKey key = default(TKey); + if (type_key.IsEnum) { - key = (TKey)Enum.Parse(type_key, field.GetValue(d).ToString()); + if (type_field == typeof(string)) + { + key = (TKey)Enum.Parse(type_key, field.GetValue(d).ToString()); + } + else if (type_field == typeof(int)) + { + key = (TKey)field.GetValue(d); + } } - else if(type_field == typeof(int)) + else { key = (TKey)field.GetValue(d); } - } - else - { - key = (TKey)field.GetValue(d); - } - if (key == null) - { - LogHelper.LogError("CSVReader.ReadDictionary(): key is null"); - continue; - } + if (key == null) + { + LogHelper.LogError("CSVReader.ReadDictionary(): key is null"); + continue; + } - target.Add(key, d); - count++; + target.Add(key, d); + count++; + } + return count; } - return count; + } -} +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/UI/CardUI.cs b/RogueKnights/RogueKnights/Assets/Scripts/UI/CardUI.cs index 1c2f8e4..04af7c8 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/UI/CardUI.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/UI/CardUI.cs @@ -2,17 +2,22 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class CardUI : MonoBehaviour +namespace RK.UI { - // Start is called before the first frame update - void Start() - { - - } - // Update is called once per frame - void Update() + public class CardUI : MonoBehaviour { - + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } } + } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/DontDestroySelf.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/DontDestroySelf.cs index 482a088..e762006 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/DontDestroySelf.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/DontDestroySelf.cs @@ -2,13 +2,18 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -[DefaultExecutionOrder(-1000)] -public class DontDestroySelf : MonoBehaviour +namespace RK { - private void Awake() - { - DontDestroyOnLoad(this.gameObject); - } + [DefaultExecutionOrder(-1000)] + public class DontDestroySelf : MonoBehaviour + { + + private void Awake() + { + DontDestroyOnLoad(this.gameObject); + } + + } } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Extents/TransformExtent.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Extents/TransformExtent.cs index ddd96be..6d539bb 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Extents/TransformExtent.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Extents/TransformExtent.cs @@ -2,129 +2,134 @@ using System.Collections.Generic; using UnityEngine; -public static class TransformExtent +namespace RK { - public static void Iterate(this Transform root, Action<Transform> action) + + public static class TransformExtent { - if (root == null) - return; - if (action != null) - action(root); - int childCount = root.childCount; - if (childCount == 0) - return; - for (int i = 0; i < childCount; ++i) + public static void Iterate(this Transform root, Action<Transform> action) { - Transform child = root.GetChild(i); - Iterate(child, action); + if (root == null) + return; + if (action != null) + action(root); + int childCount = root.childCount; + if (childCount == 0) + return; + for (int i = 0; i < childCount; ++i) + { + Transform child = root.GetChild(i); + Iterate(child, action); + } } - } - - /// <summary> - /// Enumerates all children in the hierarchy starting at the root object. - /// </summary> - /// <param name="root">Start point of the traversion set</param> - public static IEnumerable<Transform> EnumerateHierarchy(this Transform root) - { - if (root == null) { throw new ArgumentNullException("root"); } - return root.EnumerateHierarchyCore(new List<Transform>(0)); - } - /// <summary> - /// Enumerates all children in the hierarchy starting at the root object except for the branches in ignore. - /// </summary> - /// <param name="root">Start point of the traversion set</param> - /// <param name="ignore">Transforms and all its children to be ignored</param> - public static IEnumerable<Transform> EnumerateHierarchy(this Transform root, ICollection<Transform> ignore) - { - if (root == null) { throw new ArgumentNullException("root"); } - if (ignore == null) + /// <summary> + /// Enumerates all children in the hierarchy starting at the root object. + /// </summary> + /// <param name="root">Start point of the traversion set</param> + public static IEnumerable<Transform> EnumerateHierarchy(this Transform root) { - throw new ArgumentNullException("ignore", "Ignore collection can't be null, use EnumerateHierarchy(root) instead."); + if (root == null) { throw new ArgumentNullException("root"); } + return root.EnumerateHierarchyCore(new List<Transform>(0)); } - return root.EnumerateHierarchyCore(ignore); - } - /// <summary> - /// Enumerates all children in the hierarchy starting at the root object except for the branches in ignore. - /// </summary> - /// <param name="root">Start point of the traversion set</param> - /// <param name="ignore">Transforms and all its children to be ignored</param> - private static IEnumerable<Transform> EnumerateHierarchyCore(this Transform root, ICollection<Transform> ignore) - { - var transformQueue = new Queue<Transform>(); - transformQueue.Enqueue(root); - - while (transformQueue.Count > 0) + /// <summary> + /// Enumerates all children in the hierarchy starting at the root object except for the branches in ignore. + /// </summary> + /// <param name="root">Start point of the traversion set</param> + /// <param name="ignore">Transforms and all its children to be ignored</param> + public static IEnumerable<Transform> EnumerateHierarchy(this Transform root, ICollection<Transform> ignore) { - var parentTransform = transformQueue.Dequeue(); + if (root == null) { throw new ArgumentNullException("root"); } + if (ignore == null) + { + throw new ArgumentNullException("ignore", "Ignore collection can't be null, use EnumerateHierarchy(root) instead."); + } + return root.EnumerateHierarchyCore(ignore); + } - if (!parentTransform || ignore.Contains(parentTransform)) { continue; } + /// <summary> + /// Enumerates all children in the hierarchy starting at the root object except for the branches in ignore. + /// </summary> + /// <param name="root">Start point of the traversion set</param> + /// <param name="ignore">Transforms and all its children to be ignored</param> + private static IEnumerable<Transform> EnumerateHierarchyCore(this Transform root, ICollection<Transform> ignore) + { + var transformQueue = new Queue<Transform>(); + transformQueue.Enqueue(root); - for (var i = 0; i < parentTransform.childCount; i++) + while (transformQueue.Count > 0) { - transformQueue.Enqueue(parentTransform.GetChild(i)); - } + var parentTransform = transformQueue.Dequeue(); + + if (!parentTransform || ignore.Contains(parentTransform)) { continue; } + + for (var i = 0; i < parentTransform.childCount; i++) + { + transformQueue.Enqueue(parentTransform.GetChild(i)); + } - yield return parentTransform; + yield return parentTransform; + } } - } - public static void SetPositionX(this Transform trans, float value) - { - Vector3 pos = trans.position; - pos.x = value; - trans.position = pos; - } + public static void SetPositionX(this Transform trans, float value) + { + Vector3 pos = trans.position; + pos.x = value; + trans.position = pos; + } - public static void SetPositionY(this Transform trans, float value) - { - Vector3 pos = trans.position; - pos.y = value; - trans.position = pos; - } + public static void SetPositionY(this Transform trans, float value) + { + Vector3 pos = trans.position; + pos.y = value; + trans.position = pos; + } - public static void SetPositionZ(this Transform trans, float value) - { - Vector3 pos = trans.position; - pos.z = value; - trans.position = pos; - } + public static void SetPositionZ(this Transform trans, float value) + { + Vector3 pos = trans.position; + pos.z = value; + trans.position = pos; + } - public static void SetLocalPositionX(this Transform trans, float value) - { - Vector3 pos = trans.localPosition; - pos.x = value; - trans.localPosition = pos; - } + public static void SetLocalPositionX(this Transform trans, float value) + { + Vector3 pos = trans.localPosition; + pos.x = value; + trans.localPosition = pos; + } - public static void SetLocalPositionY(this Transform trans, float value) - { - Vector3 pos = trans.localPosition; - pos.y = value; - trans.localPosition = pos; - } + public static void SetLocalPositionY(this Transform trans, float value) + { + Vector3 pos = trans.localPosition; + pos.y = value; + trans.localPosition = pos; + } - public static void SetLocalPositionZ(this Transform trans, float value) - { - Vector3 pos = trans.localPosition; - pos.z = value; - trans.localPosition = pos; - } + public static void SetLocalPositionZ(this Transform trans, float value) + { + Vector3 pos = trans.localPosition; + pos.z = value; + trans.localPosition = pos; + } - public static void SetToGlobalScale(this Transform trans, Vector3 desiredScale) - { - Transform t = trans; - Vector3 res = desiredScale; - while (t.parent != null) + public static void SetToGlobalScale(this Transform trans, Vector3 desiredScale) { - Transform parent = t.parent; - res.x /= parent.localScale.x; - res.y /= parent.localScale.y; - res.z /= parent.localScale.z; - t = t.parent; + Transform t = trans; + Vector3 res = desiredScale; + while (t.parent != null) + { + Transform parent = t.parent; + res.x /= parent.localScale.x; + res.y /= parent.localScale.y; + res.z /= parent.localScale.z; + t = t.parent; + } + Debug.Log("DragonIsleMapRoll scale=" + res); + trans.localScale = res; } - Debug.Log("DragonIsleMapRoll scale=" + res); - trans.localScale = res; } -} + +}
\ No newline at end of file diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/FPSScript.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/FPSScript.cs index 9c9a444..bb30672 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/FPSScript.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/FPSScript.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; using System.Collections; -namespace FBCapture +namespace RK { public class FPSScript : MonoBehaviour { diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/GameObjectExtensions.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/GameObjectExtensions.cs index 84ce560..0258479 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/GameObjectExtensions.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/GameObjectExtensions.cs @@ -2,45 +2,49 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public static class GameObjectExtensions +namespace RK { - public static void SetParent(this GameObject obj, Transform parent) - { - if (!(obj == null)) - { - obj.transform.SetParent(parent); - } - } - public static GameObject Find(this GameObject obj, string name) + public static class GameObjectExtensions { - if (obj == null) + public static void SetParent(this GameObject obj, Transform parent) { - return null; + if (!(obj == null)) + { + obj.transform.SetParent(parent); + } } - Transform transform = obj.transform.Find(name); - if (!(transform != null)) + public static GameObject Find(this GameObject obj, string name) { - return null; - } + if (obj == null) + { + return null; + } - return transform.gameObject; - } + Transform transform = obj.transform.Find(name); + if (!(transform != null)) + { + return null; + } - public static T GetOrAddComponent<T>(this GameObject go) where T : Component - { - if (go == null) - { - return null; + return transform.gameObject; } - T val = go.GetComponent<T>(); - if ((Object)val == (Object)null) + public static T GetOrAddComponent<T>(this GameObject go) where T : Component { - val = go.AddComponent<T>(); - } + if (go == null) + { + return null; + } - return val; + T val = go.GetComponent<T>(); + if ((Object)val == (Object)null) + { + val = go.AddComponent<T>(); + } + + return val; + } } -}
\ No newline at end of file +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs index feea456..353c3cb 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/LogHelper.cs @@ -1,29 +1,26 @@ -using System.Collections; -using System.Collections.Generic; -using System.Runtime.CompilerServices; using UnityEngine; namespace RK { -} + public static class LogHelper + { -public static class LogHelper -{ + public static void LogError(object msg) + { + Debug.LogError(msg); + } - public static void LogError(object msg) - { - Debug.LogError(msg); - } + public static void Log(object msg) + { + Debug.Log(msg); + } - public static void Log(object msg) - { - Debug.Log(msg); - } + public static void LogEditorError(object msg) + { + Debug.Log(msg); + } - public static void LogEditorError(object msg) - { - Debug.Log(msg); } } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/MathUtils.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/MathUtils.cs index c997495..b1d765f 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/MathUtils.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/MathUtils.cs @@ -1,25 +1,27 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; -public static class MathUtils +namespace RK { - public static Vector2 Abs(Vector2 v) + public static class MathUtils { - return new Vector2(Mathf.Abs(v.x), Mathf.Abs(v.y)); - } - public static Vector2 Max(Vector2 src, float v) - { - return new Vector2(Mathf.Max(src.x, v), Mathf.Max(src.y, v)); - } + public static Vector2 Abs(Vector2 v) + { + return new Vector2(Mathf.Abs(v.x), Mathf.Abs(v.y)); + } - public static void Swap(ref float f1, ref float f2) - { - float t = f1; - f1 = f2; - f2 = t; - } + public static Vector2 Max(Vector2 src, float v) + { + return new Vector2(Mathf.Max(src.x, v), Mathf.Max(src.y, v)); + } + + public static void Swap(ref float f1, ref float f2) + { + float t = f1; + f1 = f2; + f2 = t; + } -}
\ No newline at end of file + } +} diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/SetSortingOrder.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/SetSortingOrder.cs index e268173..ec38723 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/SetSortingOrder.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/SetSortingOrder.cs @@ -2,25 +2,30 @@ using System.Collections.Generic; using UnityEngine; -public class SetSortingOrder : MonoBehaviour +namespace RK { - public int sortingOrder; - public void ForceRefreshSortingOrder() - { - transform.Iterate((trans) => - { - Renderer render = trans.gameObject.GetComponent<Renderer>(); - if (render != null) - { - render.sortingOrder += sortingOrder; - } - }); - } + public class SetSortingOrder : MonoBehaviour + { + public int sortingOrder; - public void Start() - { - ForceRefreshSortingOrder(); - } + public void ForceRefreshSortingOrder() + { + transform.Iterate((trans) => + { + Renderer render = trans.gameObject.GetComponent<Renderer>(); + if (render != null) + { + render.sortingOrder += sortingOrder; + } + }); + } + + public void Start() + { + ForceRefreshSortingOrder(); + } + + } } diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs index 7a26423..58907bd 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/StringUtils.cs @@ -4,7 +4,7 @@ using System.Security.Cryptography; using System.Text; using UnityEngine; -namespace RK.Utils +namespace RK { public class StringUtils diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector2Extension.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector2Extension.cs index aa96509..4a880bf 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector2Extension.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector2Extension.cs @@ -4,21 +4,26 @@ using Unity.VisualScripting; using UnityEditor; using UnityEngine; -public static class Vector2Extension +namespace RK { - public static Vector3 ConvertToVector3(Vector2 src) + public static class Vector2Extension { - Vector3 dst = new Vector3(); - dst.x = src.x; - dst.y = src.y; - dst.z = 0; - return dst; - } - public static Vector3 ToVector3(this Vector2 src) - { - return ConvertToVector3(src); + public static Vector3 ConvertToVector3(Vector2 src) + { + Vector3 dst = new Vector3(); + dst.x = src.x; + dst.y = src.y; + dst.z = 0; + return dst; + } + + public static Vector3 ToVector3(this Vector2 src) + { + return ConvertToVector3(src); + } + } -} +}
\ No newline at end of file diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector3Extension.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector3Extension.cs index 5afe941..a4db6fe 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector3Extension.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector3Extension.cs @@ -4,23 +4,28 @@ using Unity.VisualScripting; using UnityEditor; using UnityEngine; -public static class Vector3Extension +namespace RK { - public static Vector2 xy(this Vector3 src) + public static class Vector3Extension { - Vector2 xy = new Vector2(); - xy.x = src.x; - xy.y = src.y; - return xy; - } - public static Vector2 ToVector2(this Vector3 src) - { - Vector2 xy = new Vector2(); - xy.x = src.x; - xy.y = src.y; - return xy; + public static Vector2 xy(this Vector3 src) + { + Vector2 xy = new Vector2(); + xy.x = src.x; + xy.y = src.y; + return xy; + } + + public static Vector2 ToVector2(this Vector3 src) + { + Vector2 xy = new Vector2(); + xy.x = src.x; + xy.y = src.y; + return xy; + } + } -} +}
\ No newline at end of file diff --git a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector4Extension.cs b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector4Extension.cs index e4b9b35..ffe83e7 100644 --- a/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector4Extension.cs +++ b/RogueKnights/RogueKnights/Assets/Scripts/Utils/Vector4Extension.cs @@ -4,31 +4,36 @@ using Unity.VisualScripting; using UnityEditor; using UnityEngine; -public static class Vector4Extension +namespace RK { - public static Vector2 xy(this Vector4 src) + public static class Vector4Extension { - Vector2 xy = new Vector2(); - xy.x = src.x; - xy.y = src.y; - return xy; - } - public static Vector2 zw(this Vector4 src) - { - Vector2 zw = new Vector2(); - zw.x = src.z; - zw.y = src.w; - return zw; - } + public static Vector2 xy(this Vector4 src) + { + Vector2 xy = new Vector2(); + xy.x = src.x; + xy.y = src.y; + return xy; + } + + public static Vector2 zw(this Vector4 src) + { + Vector2 zw = new Vector2(); + zw.x = src.z; + zw.y = src.w; + return zw; + } + + public static Vector2 ToVector2(this Vector4 src) + { + Vector2 xy = new Vector2(); + xy.x = src.x; + xy.y = src.y; + return xy; + } - public static Vector2 ToVector2(this Vector4 src) - { - Vector2 xy = new Vector2(); - xy.x = src.x; - xy.y = src.y; - return xy; } -} +}
\ No newline at end of file diff --git a/RogueKnights/RogueKnights/Assets/Settings/URP-Balanced.asset b/RogueKnights/RogueKnights/Assets/Settings/URP-Balanced.asset index a4c84ef..1971c7b 100644 --- a/RogueKnights/RogueKnights/Assets/Settings/URP-Balanced.asset +++ b/RogueKnights/RogueKnights/Assets/Settings/URP-Balanced.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-Balanced m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 1024 @@ -50,25 +53,62 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 512 m_AdditionalLightsCookieFormat: 1 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity-Renderer.asset b/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity-Renderer.asset index be527e4..33f6aa8 100644 --- a/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: SSAO m_EditorClassIdentifier: m_Active: 1 - m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} m_Settings: + AOMethod: 1 Downsample: 0 AfterOpaque: 0 Source: 1 @@ -22,7 +22,19 @@ MonoBehaviour: Intensity: 0.5 DirectLightingStrength: 0.25 Radius: 0.25 - SampleCount: 12 + Samples: 0 + BlurQuality: 0 + Falloff: 100 + SampleCount: -1 + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38,6 +50,7 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: - {fileID: -1878332245247344467} m_RendererFeatureMap: adc0de57c6d2eee5 @@ -51,14 +64,18 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 @@ -78,6 +95,4 @@ MonoBehaviour: m_DepthPrimingMode: 1 m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 0 diff --git a/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity.asset b/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity.asset index 6248100..d526597 100644 --- a/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity.asset +++ b/RogueKnights/RogueKnights/Assets/Settings/URP-HighFidelity.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-HighFidelity m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,10 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 4 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 @@ -47,23 +53,62 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 4096 m_AdditionalLightsCookieFormat: 4 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 1 diff --git a/RogueKnights/RogueKnights/Assets/Settings/URP-Performant.asset b/RogueKnights/RogueKnights/Assets/Settings/URP-Performant.asset index 5e53341..8650b69 100644 --- a/RogueKnights/RogueKnights/Assets/Settings/URP-Performant.asset +++ b/RogueKnights/RogueKnights/Assets/Settings/URP-Performant.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-Performant m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,10 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 0 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 1024 @@ -47,23 +53,62 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 16 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs index 8e9e94a..a5dfcad 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/LitJson/JsonMapper.cs @@ -550,7 +550,7 @@ namespace LitJson //====修改新增逻辑==== //报错，并暂停编辑器UI - LogHelper.LogError(String.Format( + RK.LogHelper.LogError(String.Format( "The type {0} doesn't have the " + "property '{1}'", inst_type, property)); UnityEngine.Debug.Break(); diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/DoubleVString.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/DoubleVString.cs index 5d9c6e8..6aaeb2c 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/DoubleVString.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/DoubleVString.cs @@ -2,36 +2,39 @@ using System.Collections.Generic; using UnityEngine; +namespace RK +{ -/// <summary> -/// 给UI.Text使用的double buffer string -/// </summary> -public class DoubleVString -{ - private int index; - private VString stringA; - private VString stringB; - - public DoubleVString(int maxCount) - { - stringA = new VString(maxCount); - stringB = new VString(maxCount); - } - - public VString GetCurrentVString() - { - return (index % 2) == 0 ? stringA : stringB; - } - - public VString GetNextVString() + /// <summary> + /// 给UI.Text使用的double buffer string + /// </summary> + public class DoubleVString { - return (index % 2) == 0 ? stringB : stringA; - } + private int index; + private VString stringA; + private VString stringB; + public DoubleVString(int maxCount) + { + stringA = new VString(maxCount); + stringB = new VString(maxCount); + } - //交换current 和Next string对象 - public void SwapVString() - { - index = (index + 1) % 2; + public VString GetCurrentVString() + { + return (index % 2) == 0 ? stringA : stringB; + } + + public VString GetNextVString() + { + return (index % 2) == 0 ? stringB : stringA; + } + + + //交换current 和Next string对象 + public void SwapVString() + { + index = (index + 1) % 2; + } } -}
\ No newline at end of file +} diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil.cs index 1b885bd..a6b5791 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil.cs @@ -553,7 +553,7 @@ public partial class StringUtil } catch (Exception e) { - LogHelper.LogError(e.Message); + RK.LogHelper.LogError(e.Message); return format; } } diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil_Other.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil_Other.cs index d9d0616..0755acf 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil_Other.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/StringUtil_Other.cs @@ -163,7 +163,7 @@ public partial class StringUtil return str; } - LogHelper.LogError("fromIndex over flow."); + RK.LogHelper.LogError("fromIndex over flow."); return ""; } diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VString.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VString.cs index 9563280..c293aea 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VString.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VString.cs @@ -3,96 +3,97 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - - -public static class StringExtend +namespace RK { - private static volatile object lockThis = new object(); - public static string ToTempString(this int i) + public static class StringExtend { - lock (lockThis) + private static volatile object lockThis = new object(); + + public static string ToTempString(this int i) { - return VString.IntToString(i); + lock (lockThis) + { + return VString.IntToString(i); + } } - } - public static string ToTempString(this float f, int digits = 2) - { - lock (lockThis) + public static string ToTempString(this float f, int digits = 2) { - return VString.FloatToString(f, digits); + lock (lockThis) + { + return VString.FloatToString(f, digits); + } } - } - public static string ToTempString(this long l) - { - lock (lockThis) + public static string ToTempString(this long l) { - return VString.LongToString(l); + lock (lockThis) + { + return VString.LongToString(l); + } } - } - public static string ToTempStringLower(this string str) - { - lock (lockThis) + public static string ToTempStringLower(this string str) { - return VString.ToLower(str); + lock (lockThis) + { + return VString.ToLower(str); + } } - } - public static string ToTempStringUpper(this string str) - { - lock (lockThis) + public static string ToTempStringUpper(this string str) { - return VString.ToUpper(str); + lock (lockThis) + { + return VString.ToUpper(str); + } } - } - public static string ToTempSubString(this string str, int index, int count) - { - lock (lockThis) + public static string ToTempSubString(this string str, int index, int count) { - return VString.ToTempSubString(str, index, count); + lock (lockThis) + { + return VString.ToTempSubString(str, index, count); + } } - } - - #region 转美式数字 - public static string ToStringUS(this float f) - { - return StringUtil.Num2US(f); - } - public static string ToStringUS(this int i) - { - return StringUtil.Num2US(i); - } - public static string ToStringUS(this long i) - { - return StringUtil.Num2US(i); - } - #endregion -} + #region 转美式数字 + public static string ToStringUS(this float f) + { + return StringUtil.Num2US(f); + } + public static string ToStringUS(this int i) + { + return StringUtil.Num2US(i); + } + public static string ToStringUS(this long i) + { + return StringUtil.Num2US(i); + } + #endregion + } -/// <summary> -/// 内容可变的字符串 -/// !!!只能作为临时变量使用,绝对不可以在逻辑中存储引用,包含VString和返回的string对象 -/// </summary> -public class VString -{ - private string _data; - private int maxCount; - private static int _internalVsIndex; - private static VString[] _internalVSArray = new VString[] + /// <summary> + /// 内容可变的字符串 + /// !!!只能作为临时变量使用,绝对不可以在逻辑中存储引用,包含VString和返回的string对象 + /// </summary> + public class VString { + private string _data; + private int maxCount; + + private static int _internalVsIndex; + private static VString[] _internalVSArray = new VString[] + { new VString(64), new VString(64), new VString(64), @@ -113,506 +114,507 @@ public class VString new VString(64), new VString(64), new VString(64) - }; - private static string[] digitalNumberArray = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - - - public VString(int maxCount = 1024) - { - this.maxCount = maxCount + 1; //多加一个，用于留1个给字符串结束符 - _data = new string('\0', this.maxCount); - Clear(); - } - - public string GetString() - { - return _data; - } - - - - /// <summary> - /// int转string,无GC,注意生成的string一定不能进行存贮 - /// </summary> - /// <param name="val"></param> - /// <returns></returns> - public static string IntToString(int val) - { - return LongToString(val); - } + }; + private static string[] digitalNumberArray = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - /// <summary> - /// long转string,无GC,注意生成的string一定不能进行存贮 - /// </summary> - /// <param name="val"></param> - /// <returns></returns> - public static string LongToString(long val) - { - if (val == 0) - { - return "0"; - } - VString tempVS = GetInternalVString(); - bool isNegative = false; - if (val < 0) + public VString(int maxCount = 1024) { - val = -val; - isNegative = true; + this.maxCount = maxCount + 1; //多加一个，用于留1个给字符串结束符 + _data = new string('\0', this.maxCount); + Clear(); } - while (val != 0) + public string GetString() { - long mod = val % 10; - val = val / 10; - tempVS.Push(digitalNumberArray[mod]); + return _data; } - if (isNegative) - { - tempVS.Push("-"); - } - tempVS.ReverseString(); - return tempVS.GetString(); - } - /// <summary> - /// float转string,无GC,注意生成的string一定不能进行存贮 - /// </summary> - /// <param name="f"></param> - /// <param name="digits">小数的位数</param> - /// <returns></returns> - public static string FloatToString(float f, int digits = 2) - { - bool isNegative = false; - if (f < 0) + /// <summary> + /// int转string,无GC,注意生成的string一定不能进行存贮 + /// </summary> + /// <param name="val"></param> + /// <returns></returns> + public static string IntToString(int val) { - f = -f; - isNegative = true; + return LongToString(val); } - int iPart = Mathf.FloorToInt(f); - float fPart = f - iPart; + /// <summary> + /// long转string,无GC,注意生成的string一定不能进行存贮 + /// </summary> + /// <param name="val"></param> + /// <returns></returns> + public static string LongToString(long val) + { + if (val == 0) + { + return "0"; + } - VString tempVS0 = GetInternalVString(); + VString tempVS = GetInternalVString(); + bool isNegative = false; + if (val < 0) + { + val = -val; + isNegative = true; + } + while (val != 0) + { + long mod = val % 10; + val = val / 10; + tempVS.Push(digitalNumberArray[mod]); + } - if (iPart != 0) - { - while (iPart != 0) + if (isNegative) { - long mod = iPart % 10; - iPart = iPart / 10; - tempVS0.Push(digitalNumberArray[mod]); + tempVS.Push("-"); } - } - else - { - tempVS0.Push("0"); + + tempVS.ReverseString(); + return tempVS.GetString(); } - if (isNegative) + /// <summary> + /// float转string,无GC,注意生成的string一定不能进行存贮 + /// </summary> + /// <param name="f"></param> + /// <param name="digits">小数的位数</param> + /// <returns></returns> + public static string FloatToString(float f, int digits = 2) { - tempVS0.Push("-"); - } - tempVS0.ReverseString(); + bool isNegative = false; + if (f < 0) + { + f = -f; + isNegative = true; + } + int iPart = Mathf.FloorToInt(f); + float fPart = f - iPart; - if (digits != 0) - { - VString tempVS1 = GetInternalVString(); - fPart = fPart * Mathf.Pow(10, digits); - int iPart2 = Mathf.RoundToInt(fPart); + VString tempVS0 = GetInternalVString(); - int i = 0; - while (iPart2 != 0 && i < digits) + + if (iPart != 0) { - long mod = iPart2 % 10; - iPart2 = iPart2 / 10; - i++; - tempVS1.Push(digitalNumberArray[mod]); + while (iPart != 0) + { + long mod = iPart % 10; + iPart = iPart / 10; + tempVS0.Push(digitalNumberArray[mod]); + } } - tempVS1.ReverseString(); - - tempVS0.Push("."); - tempVS0.Push(tempVS1.GetString()); - while (i < digits) + else { - i++; tempVS0.Push("0"); } - } - else - { - tempVS0.Push("."); - for (int i = 0; i < digits; ++i) + + if (isNegative) { - tempVS0.Push("0"); + tempVS0.Push("-"); } - } + tempVS0.ReverseString(); - return tempVS0.GetString(); - } + if (digits != 0) + { + VString tempVS1 = GetInternalVString(); + fPart = fPart * Mathf.Pow(10, digits); + int iPart2 = Mathf.RoundToInt(fPart); - /// <summary> - /// 把一个字符串拷贝后,转换为lower case,,注意生成的string一定不能进行存贮 - /// </summary> - /// <param name="str"></param> - /// <returns></returns> - public static string ToLower(string str) - { - if (!string.IsNullOrEmpty(str)) - { - VString tempVS = VStringShareObject.GetShareVString(); - tempVS.Push(str); - tempVS.ToLower(); - return tempVS.GetString(); - } - return str; - } + int i = 0; + while (iPart2 != 0 && i < digits) + { + long mod = iPart2 % 10; + iPart2 = iPart2 / 10; + i++; + tempVS1.Push(digitalNumberArray[mod]); + } + tempVS1.ReverseString(); - /// <summary> - /// 把一个字符串拷贝后,转换为upper case,,注意生成的string一定不能进行存贮 - /// </summary> - /// <param name="str"></param> - /// <returns></returns> - public static string ToUpper(string str) - { - if (!string.IsNullOrEmpty(str)) - { - VString tempVS = VStringShareObject.GetShareVString(); - tempVS.Push(str); - tempVS.ToUpper(); - return tempVS.GetString(); + tempVS0.Push("."); + tempVS0.Push(tempVS1.GetString()); + while (i < digits) + { + i++; + tempVS0.Push("0"); + } + } + else + { + tempVS0.Push("."); + for (int i = 0; i < digits; ++i) + { + tempVS0.Push("0"); + } + } + + return tempVS0.GetString(); } - return str; - } - public static string ToTempSubString(string str, int index, int count) - { - if (string.IsNullOrEmpty(str) || count <= 0 || index < 0) + + /// <summary> + /// 把一个字符串拷贝后,转换为lower case,,注意生成的string一定不能进行存贮 + /// </summary> + /// <param name="str"></param> + /// <returns></returns> + public static string ToLower(string str) { - LogHelper.LogError(VStringUtil.Concat("ToTempSubString IsNullOrEmpty ", index.ToTempString(), "/", count.ToTempString())); + if (!string.IsNullOrEmpty(str)) + { + VString tempVS = VStringShareObject.GetShareVString(); + tempVS.Push(str); + tempVS.ToLower(); + return tempVS.GetString(); + } return str; } - if (index + count > str.Length) + /// <summary> + /// 把一个字符串拷贝后,转换为upper case,,注意生成的string一定不能进行存贮 + /// </summary> + /// <param name="str"></param> + /// <returns></returns> + public static string ToUpper(string str) { - LogHelper.LogError(VStringUtil.Concat("ToTempSubString ", str, index.ToTempString(), "/", count.ToTempString())); + if (!string.IsNullOrEmpty(str)) + { + VString tempVS = VStringShareObject.GetShareVString(); + tempVS.Push(str); + tempVS.ToUpper(); + return tempVS.GetString(); + } return str; } - VString tempVS1 = VStringShareObject.GetShareVString(); - tempVS1.Push(str); - VString tempVS2 = VStringShareObject.GetShareVString(); - tempVS2.CopyFrom(tempVS1, index, count); - return tempVS2.GetString(); - } - - - /// <summary> - /// 拼接两个字符串 - /// </summary> - /// <param name="a"></param> - /// <param name="b"></param> - /// <param name="clear"></param> - /// <returns></returns> - public string Concat(string a, string b, bool clear = true) - { - if (clear) + public static string ToTempSubString(string str, int index, int count) { - Clear(); - } + if (string.IsNullOrEmpty(str) || count <= 0 || index < 0) + { + LogHelper.LogError(VStringUtil.Concat("ToTempSubString IsNullOrEmpty ", index.ToTempString(), "/", count.ToTempString())); + return str; + } - Push(a); - Push(b); - return _data; - } + if (index + count > str.Length) + { + LogHelper.LogError(VStringUtil.Concat("ToTempSubString ", str, index.ToTempString(), "/", count.ToTempString())); + return str; + } + VString tempVS1 = VStringShareObject.GetShareVString(); + tempVS1.Push(str); + VString tempVS2 = VStringShareObject.GetShareVString(); + tempVS2.CopyFrom(tempVS1, index, count); + return tempVS2.GetString(); + } - public string Concat(string a, string b, string c, bool clear = true) - { - if (clear) + /// <summary> + /// 拼接两个字符串 + /// </summary> + /// <param name="a"></param> + /// <param name="b"></param> + /// <param name="clear"></param> + /// <returns></returns> + public string Concat(string a, string b, bool clear = true) { - Clear(); - } + if (clear) + { + Clear(); + } - Push(a); - Push(b); - Push(c); - return _data; - } - public string Concat(string a, string b, string c, string d, bool clear = true) - { - if (clear) - { - Clear(); + Push(a); + Push(b); + return _data; } - Push(a); - Push(b); - Push(c); - Push(d); - return _data; - } - public string Concat(string a, string b, string c, string d, string e, bool clear = true) - { - if (clear) - { - Clear(); - } - Push(a); - Push(b); - Push(c); - Push(d); - Push(e); - return _data; - } - public string Concat(string a, string b, string c, string d, string e, string f, bool clear = true) - { - if (clear) - { - Clear(); - } - Push(a); - Push(b); - Push(c); - Push(d); - Push(e); - Push(f); - return _data; - } - public string Concat(string a, string b, string c, string d, string e, string f, string g, bool clear = true) - { - if (clear) + public string Concat(string a, string b, string c, bool clear = true) { - Clear(); + if (clear) + { + Clear(); + } + + Push(a); + Push(b); + Push(c); + return _data; } + public string Concat(string a, string b, string c, string d, bool clear = true) + { + if (clear) + { + Clear(); + } - Push(a); - Push(b); - Push(c); - Push(d); - Push(e); - Push(f); - Push(g); - return _data; - } - public string Concat(string a, string b, string c, string d, string e, string f, string g, string h, bool clear = true) - { - if (clear) + Push(a); + Push(b); + Push(c); + Push(d); + return _data; + } + public string Concat(string a, string b, string c, string d, string e, bool clear = true) { - Clear(); + if (clear) + { + Clear(); + } + + Push(a); + Push(b); + Push(c); + Push(d); + Push(e); + return _data; } + public string Concat(string a, string b, string c, string d, string e, string f, bool clear = true) + { + if (clear) + { + Clear(); + } - Push(a); - Push(b); - Push(c); - Push(d); - Push(e); - Push(f); - Push(g); - Push(h); - return _data; - } - public string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i, bool clear = true) - { - if (clear) + Push(a); + Push(b); + Push(c); + Push(d); + Push(e); + Push(f); + return _data; + } + public string Concat(string a, string b, string c, string d, string e, string f, string g, bool clear = true) { - Clear(); + if (clear) + { + Clear(); + } + + Push(a); + Push(b); + Push(c); + Push(d); + Push(e); + Push(f); + Push(g); + return _data; } + public string Concat(string a, string b, string c, string d, string e, string f, string g, string h, bool clear = true) + { + if (clear) + { + Clear(); + } - Push(a); - Push(b); - Push(c); - Push(d); - Push(e); - Push(f); - Push(g); - Push(h); - Push(i); - return _data; - } - public string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i, string j, bool clear = true) - { - if (clear) + Push(a); + Push(b); + Push(c); + Push(d); + Push(e); + Push(f); + Push(g); + Push(h); + return _data; + } + public string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i, bool clear = true) { - Clear(); + if (clear) + { + Clear(); + } + + Push(a); + Push(b); + Push(c); + Push(d); + Push(e); + Push(f); + Push(g); + Push(h); + Push(i); + return _data; } + public string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i, string j, bool clear = true) + { + if (clear) + { + Clear(); + } - Push(a); - Push(b); - Push(c); - Push(d); - Push(e); - Push(f); - Push(g); - Push(h); - Push(i); - Push(j); - return _data; - } + Push(a); + Push(b); + Push(c); + Push(d); + Push(e); + Push(f); + Push(g); + Push(h); + Push(i); + Push(j); + return _data; + } - public static bool UseShareObject(string str) - { - for (int i = 0; i < _internalVSArray.Length; ++i) + public static bool UseShareObject(string str) { - if (string.ReferenceEquals(str, _internalVSArray[i].GetString())) + for (int i = 0; i < _internalVSArray.Length; ++i) { - return true; + if (string.ReferenceEquals(str, _internalVSArray[i].GetString())) + { + return true; + } } + return false; } - return false; - } - //往当前的字符串中添加字符串 - public unsafe void Push(string newStr) - { - if (string.IsNullOrEmpty(newStr)) + //往当前的字符串中添加字符串 + public unsafe void Push(string newStr) { - return; - } + if (string.IsNullOrEmpty(newStr)) + { + return; + } - int copyLen = newStr.Length; - int newLen = _data.Length + copyLen; - if ((newLen + 1) > maxCount) //留1个给字符串结束符 - { - int len = newLen; - copyLen = maxCount - _data.Length - 1; - newLen = maxCount - 1; //设置新的长度 - //这个地方不使用VstringUtil.Concat避免死循环 - LogHelper.LogEditorError(StringUtil.Concat("超过了最大添加长度 ", maxCount.ToTempString(), " ", len.ToTempString())); - } + int copyLen = newStr.Length; + int newLen = _data.Length + copyLen; + if ((newLen + 1) > maxCount) //留1个给字符串结束符 + { + int len = newLen; + copyLen = maxCount - _data.Length - 1; + newLen = maxCount - 1; //设置新的长度 + //这个地方不使用VstringUtil.Concat避免死循环 + LogHelper.LogEditorError(StringUtil.Concat("超过了最大添加长度 ", maxCount.ToTempString(), " ", len.ToTempString())); + } - if (copyLen <= 0) - { - return; - } + if (copyLen <= 0) + { + return; + } - fixed (char* src = newStr) - { - fixed (char* dst = _data) + fixed (char* src = newStr) { - UnsafeFunction.memcpyimpl((byte*)src, (byte*)(dst + _data.Length), copyLen * 2); //system.string的存储每个元素两个字节 + fixed (char* dst = _data) + { + UnsafeFunction.memcpyimpl((byte*)src, (byte*)(dst + _data.Length), copyLen * 2); //system.string的存储每个元素两个字节 - int* iDst = (int*)dst; - iDst = iDst - 1; //字符串的长度在第一个元素的前面4个字节 - *iDst = newLen; + int* iDst = (int*)dst; + iDst = iDst - 1; //字符串的长度在第一个元素的前面4个字节 + *iDst = newLen; - char* iEnd = (char*)(dst + newLen); - *iEnd = (char)0;//设置字符串结束符 + char* iEnd = (char*)(dst + newLen); + *iEnd = (char)0;//设置字符串结束符 + } } } - } - public unsafe void Clear() - { - fixed (char* p = _data) + public unsafe void Clear() { - int* pSize = (int*)p; - pSize = pSize - 1; - *pSize = 0; + fixed (char* p = _data) + { + int* pSize = (int*)p; + pSize = pSize - 1; + *pSize = 0; + } } - } - public unsafe void CopyFrom(VString srcVstring, int startIndex, int count) - { - if ((count + 1) > maxCount) //留1个给字符串结束符 + public unsafe void CopyFrom(VString srcVstring, int startIndex, int count) { - throw new ArgumentException(VStringUtil.Concat("copy count is larger then maxCount ", - count.ToTempString(), " ", maxCount.ToTempString())); - } + if ((count + 1) > maxCount) //留1个给字符串结束符 + { + throw new ArgumentException(VStringUtil.Concat("copy count is larger then maxCount ", + count.ToTempString(), " ", maxCount.ToTempString())); + } - string srcStr = srcVstring.GetString(); - if (startIndex + count > srcStr.Length) - { - throw new ArgumentException(VStringUtil.Concat("copy count is larger then srcString len ", - count.ToTempString(), " ", srcStr.Length.ToTempString(), " ", startIndex.ToTempString())); - } + string srcStr = srcVstring.GetString(); + if (startIndex + count > srcStr.Length) + { + throw new ArgumentException(VStringUtil.Concat("copy count is larger then srcString len ", + count.ToTempString(), " ", srcStr.Length.ToTempString(), " ", startIndex.ToTempString())); + } - Clear(); + Clear(); - fixed (char* src = srcStr) - { - fixed (char* dst = _data) + fixed (char* src = srcStr) { - UnsafeFunction.memcpyimpl((byte*)(src + startIndex), (byte*)dst, count * 2); //system.string的存储每个元素两个字节 + fixed (char* dst = _data) + { + UnsafeFunction.memcpyimpl((byte*)(src + startIndex), (byte*)dst, count * 2); //system.string的存储每个元素两个字节 - int* iDst = (int*)dst; - iDst = iDst - 1; //字符串的长度在第一个元素的前面4个字节 - *iDst = count; + int* iDst = (int*)dst; + iDst = iDst - 1; //字符串的长度在第一个元素的前面4个字节 + *iDst = count; - char* iEnd = (char*)(dst + _data.Length); - *iEnd = (char)0;//设置字符串结束符 + char* iEnd = (char*)(dst + _data.Length); + *iEnd = (char)0;//设置字符串结束符 + } } } - } - public unsafe void ToLower() - { - int index = 0; - int len = _data.Length; - fixed (char* dst = _data) + public unsafe void ToLower() { - while (index < len) + int index = 0; + int len = _data.Length; + fixed (char* dst = _data) { - char tempChar = *(dst + index); - *(dst + index) = char.ToLower(tempChar); - ++index; + while (index < len) + { + char tempChar = *(dst + index); + *(dst + index) = char.ToLower(tempChar); + ++index; + } } } - } - public unsafe void ToUpper() - { - int index = 0; - int len = _data.Length; - fixed (char* dst = _data) + public unsafe void ToUpper() { - while (index < len) + int index = 0; + int len = _data.Length; + fixed (char* dst = _data) { - char tempChar = *(dst + index); - *(dst + index) = char.ToUpper(tempChar); - ++index; + while (index < len) + { + char tempChar = *(dst + index); + *(dst + index) = char.ToUpper(tempChar); + ++index; + } } } - } - //反转字符串的内容 - private unsafe string ReverseString() - { - int len = _data.Length; - if (len > 0) + //反转字符串的内容 + private unsafe string ReverseString() { - fixed (char* pHead = _data) + int len = _data.Length; + if (len > 0) { - int count = len / 2; - for (int i = 0; i < count; ++i) + fixed (char* pHead = _data) { - char temp = pHead[i]; - pHead[i] = pHead[len - 1 - i]; - pHead[len - 1 - i] = temp; + int count = len / 2; + for (int i = 0; i < count; ++i) + { + char temp = pHead[i]; + pHead[i] = pHead[len - 1 - i]; + pHead[len - 1 - i] = temp; + } } } + return _data; } - return _data; - } - private static VString GetInternalVString() - { - _internalVsIndex = (_internalVsIndex + 1) % _internalVSArray.Length; - VString vString = _internalVSArray[_internalVsIndex]; - vString.Clear(); - return vString; - } + private static VString GetInternalVString() + { + _internalVsIndex = (_internalVsIndex + 1) % _internalVSArray.Length; + VString vString = _internalVSArray[_internalVsIndex]; + vString.Clear(); + return vString; + } -}
\ No newline at end of file + } +} diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringShareObject.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringShareObject.cs index 0cd147d..79a7ce3 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringShareObject.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringShareObject.cs @@ -2,15 +2,16 @@ using System.Collections.Generic; using UnityEngine; - - -public static class VStringShareObject +namespace RK { - private static volatile object lockThis = new object(); - private static int _internalVsIndex; - private static VString[] _internalVSArray = new VString[] + public static class VStringShareObject { + + private static volatile object lockThis = new object(); + private static int _internalVsIndex; + private static VString[] _internalVSArray = new VString[] + { new VString(2048), new VString(2048), new VString(2048), @@ -26,29 +27,30 @@ public static class VStringShareObject new VString(2048), new VString(2048), new VString(2048) - }; + }; - public static VString GetShareVString() - { - lock(lockThis) + public static VString GetShareVString() { - _internalVsIndex = (_internalVsIndex + 1) % _internalVSArray.Length; - VString vString = _internalVSArray[_internalVsIndex]; - vString.Clear(); - return vString; + lock (lockThis) + { + _internalVsIndex = (_internalVsIndex + 1) % _internalVSArray.Length; + VString vString = _internalVSArray[_internalVsIndex]; + vString.Clear(); + return vString; + } } - } - public static bool UseShareObject(string str) - { - for (int i = 0; i < _internalVSArray.Length; ++i) + public static bool UseShareObject(string str) { - if (string.ReferenceEquals(str, _internalVSArray[i].GetString())) + for (int i = 0; i < _internalVSArray.Length; ++i) { - return true; + if (string.ReferenceEquals(str, _internalVSArray[i].GetString())) + { + return true; + } } + return false; } - return false; } -}
\ No newline at end of file +} diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringUtil.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringUtil.cs index d8d717c..3ca06c7 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringUtil.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VStringUtil.cs @@ -2,106 +2,109 @@ using System.Collections.Generic; using UnityEngine; - -/// <summary> -/// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 -/// </summary> -public class VStringUtil +namespace RK { + /// <summary> /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 /// </summary> - public static string Concat(string a, string b) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d, string e) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, e, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d, string e, string f) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, e, f, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d, string e, string f, string g) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, e, f, g, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d, string e, string f, string g, string h) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, e, f, g, h, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i) - { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, e, f, g, h, i, true); - return vString.GetString(); - } - /// <summary> - /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 - /// </summary> - public static string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i, string j) + public class VStringUtil { - VString vString = VStringShareObject.GetShareVString(); - vString.Concat(a, b, c, d, e, f, g, h, i, j, true); - return vString.GetString(); - } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d, string e) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, e, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d, string e, string f) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, e, f, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d, string e, string f, string g) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, e, f, g, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d, string e, string f, string g, string h) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, e, f, g, h, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, e, f, g, h, i, true); + return vString.GetString(); + } + /// <summary> + /// 只能作为临时字符串使用,代码任何地方使用只能赋值给临时变量,不可保存 + /// </summary> + public static string Concat(string a, string b, string c, string d, string e, string f, string g, string h, string i, string j) + { + VString vString = VStringShareObject.GetShareVString(); + vString.Concat(a, b, c, d, e, f, g, h, i, j, true); + return vString.GetString(); + } - /// <summary> - /// 如果不是共享string,则返回str,如果是共享string则返回copy str - /// </summary> - /// <param name="str"></param> - /// <returns></returns> - public static string ConvertToNormalString(string str) - { - if(VStringShareObject.UseShareObject(str) || VString.UseShareObject(str)) + /// <summary> + /// 如果不是共享string,则返回str,如果是共享string则返回copy str + /// </summary> + /// <param name="str"></param> + /// <returns></returns> + public static string ConvertToNormalString(string str) { - return string.Copy(str); + if (VStringShareObject.UseShareObject(str) || VString.UseShareObject(str)) + { + return string.Copy(str); + } + return str; } - return str; - } -}
\ No newline at end of file + } +} diff --git a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VTypingString.cs b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VTypingString.cs index 50b63e6..b260f53 100644 --- a/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VTypingString.cs +++ b/RogueKnights/RogueKnights/Assets/ThirdParty/StringUtil/VTypingString.cs @@ -4,168 +4,173 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -/// <summary> -/// 优化打字功能的字符串 -/// </summary> -public class VTypingString +namespace RK { - enum Tags - { - Color = 0, - Size, - B, - I - } - - - private VString allContentString; - private DoubleVString partialDisplayString; - private VString willShowString; - - private int _timerMS; - private int _factor; - private int _miniSecondPerWord; - - private static readonly string[] endTags = new string[] { "</color>", "</size>", "</b>", "</i>" }; - private static readonly string[] startTags = new string[] { "<color", "<size", "<b", "<i" }; - - List<int> endTagCaches = new List<int>(); - /// <summary> - /// + /// 优化打字功能的字符串 /// </summary> - /// <param name="text"></param> - /// <param name="miniSecondPerWord">出一个字符需要的毫秒时间</param> - public VTypingString(string text, int miniSecondPerWord = 240) + public class VTypingString { - if(string.IsNullOrEmpty(text)) + enum Tags { - throw new ArgumentException("text is null or empty"); + Color = 0, + Size, + B, + I } - _miniSecondPerWord = Mathf.Max(miniSecondPerWord, 10); - allContentString = new VString(text.Length); - allContentString.Push(text); - partialDisplayString = new DoubleVString(text.Length); - willShowString = new VString(text.Length); - JumpToBegin(); - } - public bool IsEnd() - { - return _factor > allContentString.GetString().Length; - } - - public string GetString() - { - return partialDisplayString.GetCurrentVString().GetString(); - } + private VString allContentString; + private DoubleVString partialDisplayString; + private VString willShowString; - /// <summary> - /// - /// </summary> - /// <param name="deltaTimeMS"></param> - /// <returns>true表示触发了一次打字变化</returns> - public bool OnUpdate(int deltaTimeMS) - { - _timerMS += deltaTimeMS; - if(_timerMS >= _miniSecondPerWord) - { - _timerMS = 0; - OnTyping(); - return true; - } - return false; - } + private int _timerMS; + private int _factor; + private int _miniSecondPerWord; - private void OnTyping() - { - if (CheckStart(Tags.Color)) { } - else if (CheckStart(Tags.Size)) { } - else if (CheckStart(Tags.B)) { } - else if (CheckStart(Tags.I)) { } - else + private static readonly string[] endTags = new string[] { "</color>", "</size>", "</b>", "</i>" }; + private static readonly string[] startTags = new string[] { "<color", "<size", "<b", "<i" }; + + List<int> endTagCaches = new List<int>(); + + + /// <summary> + /// + /// </summary> + /// <param name="text"></param> + /// <param name="miniSecondPerWord">出一个字符需要的毫秒时间</param> + public VTypingString(string text, int miniSecondPerWord = 240) { - partialDisplayString.GetCurrentVString().Clear(); - partialDisplayString.SwapVString(); - partialDisplayString.GetCurrentVString().CopyFrom(allContentString, 0, Mathf.Min(_factor, allContentString.GetString().Length)); - for (int i = endTagCaches.Count - 1; i >= 0; --i) + if (string.IsNullOrEmpty(text)) { - partialDisplayString.GetCurrentVString().Push(endTags[endTagCaches[i]]); + throw new ArgumentException("text is null or empty"); } - _factor++; - } - } - public void JumpToBegin() - { - _factor = 0; - _timerMS = -_miniSecondPerWord; - endTagCaches.Clear(); - partialDisplayString.GetCurrentVString().Clear(); - partialDisplayString.GetNextVString().Clear(); - } + _miniSecondPerWord = Mathf.Max(miniSecondPerWord, 10); + allContentString = new VString(text.Length); + allContentString.Push(text); + partialDisplayString = new DoubleVString(text.Length); + willShowString = new VString(text.Length); + JumpToBegin(); + } - public void JumpToEnd() - { - _factor = allContentString.GetString().Length; - endTagCaches.Clear(); - OnTyping(); - } + public bool IsEnd() + { + return _factor > allContentString.GetString().Length; + } + public string GetString() + { + return partialDisplayString.GetCurrentVString().GetString(); + } - bool CheckStart(Tags tag) - { - if (_factor >= allContentString.GetString().Length) + /// <summary> + /// + /// </summary> + /// <param name="deltaTimeMS"></param> + /// <returns>true表示触发了一次打字变化</returns> + public bool OnUpdate(int deltaTimeMS) { + _timerMS += deltaTimeMS; + if (_timerMS >= _miniSecondPerWord) + { + _timerMS = 0; + OnTyping(); + return true; + } return false; } - int iTag = (int)tag; - willShowString.CopyFrom(allContentString, _factor, allContentString.GetString().Length - _factor); - string willShow = willShowString.GetString(); - string endTag = endTags[iTag]; - if (willShow.StartsWith(startTags[iTag])) + private void OnTyping() { - int tagLeng = willShow.IndexOf(">") + 1; - _factor += tagLeng; - endTagCaches.Add(iTag);//倒叙 - if (CheckStart(Tags.Color)) { } else if (CheckStart(Tags.Size)) { } else if (CheckStart(Tags.B)) { } else if (CheckStart(Tags.I)) { } else { - return false; + partialDisplayString.GetCurrentVString().Clear(); + partialDisplayString.SwapVString(); + partialDisplayString.GetCurrentVString().CopyFrom(allContentString, 0, Mathf.Min(_factor, allContentString.GetString().Length)); + for (int i = endTagCaches.Count - 1; i >= 0; --i) + { + partialDisplayString.GetCurrentVString().Push(endTags[endTagCaches[i]]); + } + _factor++; } - return true; } - else if (willShow.StartsWith(endTag)) + + public void JumpToBegin() + { + _factor = 0; + _timerMS = -_miniSecondPerWord; + endTagCaches.Clear(); + partialDisplayString.GetCurrentVString().Clear(); + partialDisplayString.GetNextVString().Clear(); + } + + public void JumpToEnd() { - int endleng = endTag.Length;//"</color>"的长度 - _factor += endleng; - for (int i = endTagCaches.Count - 1; i >= 0; --i) + _factor = allContentString.GetString().Length; + endTagCaches.Clear(); + OnTyping(); + } + + + bool CheckStart(Tags tag) + { + if (_factor >= allContentString.GetString().Length) + { + return false; + } + + int iTag = (int)tag; + willShowString.CopyFrom(allContentString, _factor, allContentString.GetString().Length - _factor); + string willShow = willShowString.GetString(); + string endTag = endTags[iTag]; + if (willShow.StartsWith(startTags[iTag])) { - if(iTag == endTagCaches[i]) + int tagLeng = willShow.IndexOf(">") + 1; + _factor += tagLeng; + endTagCaches.Add(iTag);//倒叙 + + if (CheckStart(Tags.Color)) { } + else if (CheckStart(Tags.Size)) { } + else if (CheckStart(Tags.B)) { } + else if (CheckStart(Tags.I)) { } + else { - endTagCaches.RemoveAt(i); + return false; } + return true; } - - if (CheckStart(Tags.Color)) { } - else if (CheckStart(Tags.Size)) { } - else if (CheckStart(Tags.B)) { } - else if (CheckStart(Tags.I)) { } - else + else if (willShow.StartsWith(endTag)) { - return false; + int endleng = endTag.Length;//"</color>"的长度 + _factor += endleng; + for (int i = endTagCaches.Count - 1; i >= 0; --i) + { + if (iTag == endTagCaches[i]) + { + endTagCaches.RemoveAt(i); + } + } + + if (CheckStart(Tags.Color)) { } + else if (CheckStart(Tags.Size)) { } + else if (CheckStart(Tags.B)) { } + else if (CheckStart(Tags.I)) { } + else + { + return false; + } + return true; } - return true; + return false; } - return false; - } + } + } diff --git a/RogueKnights/RogueKnights/Assets/UniversalRenderPipelineGlobalSettings.asset b/RogueKnights/RogueKnights/Assets/UniversalRenderPipelineGlobalSettings.asset index f84421d..0c0350e 100644 --- a/RogueKnights/RogueKnights/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/RogueKnights/RogueKnights/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui.mat b/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui.mat index f8fca84..e1004bd 100644 --- a/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui.mat +++ b/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: mat_card_ui m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui_dark.mat b/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui_dark.mat index 090e640..1267e1e 100644 --- a/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui_dark.mat +++ b/RogueKnights/RogueKnights/Assets/bundles/materials/UI/mat_card_ui_dark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: mat_card_ui_dark m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_blue.mat b/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_blue.mat index acc5f31..64e62d8 100644 --- a/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_blue.mat +++ b/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: mat_blue m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_green.mat b/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_green.mat index 61a28bd..3205d18 100644 --- a/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_green.mat +++ b/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: mat_green m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_red.mat b/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_red.mat index ed49887..845a0fc 100644 --- a/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_red.mat +++ b/RogueKnights/RogueKnights/Assets/bundles/materials/test/mat_red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: mat_red m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/RogueKnights/RogueKnights/Packages/manifest.json b/RogueKnights/RogueKnights/Packages/manifest.json index 1768353..6747ff1 100644 --- a/RogueKnights/RogueKnights/Packages/manifest.json +++ b/RogueKnights/RogueKnights/Packages/manifest.json @@ -1,15 +1,16 @@ { "dependencies": { - "com.unity.collab-proxy": "2.0.7", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ai.navigation": "1.1.5", + "com.unity.collab-proxy": "2.3.1", + "com.unity.ide.rider": "3.0.28", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "12.1.12", + "com.unity.render-pipelines.universal": "14.0.10", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.5", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.0", + "com.unity.visualscripting": "1.9.2", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/RogueKnights/RogueKnights/Packages/packages-lock.json b/RogueKnights/RogueKnights/Packages/packages-lock.json index 6541065..2d2582d 100644 --- a/RogueKnights/RogueKnights/Packages/packages-lock.json +++ b/RogueKnights/RogueKnights/Packages/packages-lock.json @@ -1,16 +1,26 @@ { "dependencies": { + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.8.4", + "version": "1.8.13", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.7", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -24,7 +34,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -33,7 +43,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -56,40 +66,50 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.12", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "12.1.12", + "version": "14.0.10", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "12.1.12", - "com.unity.shadergraph": "12.1.12" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.10", + "com.unity.shadergraph": "14.0.10", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.12", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.12", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.10", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { @@ -113,7 +133,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -134,7 +154,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.0", + "version": "1.9.2", "depth": 0, "source": "registry", "dependencies": { @@ -278,17 +298,6 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, diff --git a/RogueKnights/RogueKnights/ProjectSettings/ProjectVersion.txt b/RogueKnights/RogueKnights/ProjectSettings/ProjectVersion.txt index cd32c29..bc915f1 100644 --- a/RogueKnights/RogueKnights/ProjectSettings/ProjectVersion.txt +++ b/RogueKnights/RogueKnights/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.30f1 -m_EditorVersionWithRevision: 2021.3.30f1 (b4360d7cdac4) +m_EditorVersion: 2022.3.24f1 +m_EditorVersionWithRevision: 2022.3.24f1 (334eb2a0b267) diff --git a/RogueKnights/RogueKnights/ProjectSettings/ShaderGraphSettings.asset b/RogueKnights/RogueKnights/ProjectSettings/ShaderGraphSettings.asset index 9b28428..3250b06 100644 --- a/RogueKnights/RogueKnights/ProjectSettings/ShaderGraphSettings.asset +++ b/RogueKnights/RogueKnights/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/RogueKnights/RogueKnights/ProjectSettings/URPProjectSettings.asset b/RogueKnights/RogueKnights/ProjectSettings/URPProjectSettings.asset index c1f118a..cd7fd8c 100644 --- a/RogueKnights/RogueKnights/ProjectSettings/URPProjectSettings.asset +++ b/RogueKnights/RogueKnights/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 7 diff --git a/RogueKnights/RogueKnights/ProjectSettings/boot.config b/RogueKnights/RogueKnights/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000 --- a/RogueKnights/RogueKnights/ProjectSettings/boot.config +++ /dev/null |