2 次代碼提交 5382455aa7 ... efffb2c212

作者 SHA1 備註 提交日期
  wuyu efffb2c212 修改 1 年之前
  wuyu a144323115 修改 1 年之前

+ 3 - 1
Assembly-CSharp.csproj

@@ -469,7 +469,7 @@
      <Folder Include="Assets/PaperFold/Scripts/Utils" />
      <Folder Include="Assets/Epic Toon FX/Demo/Textures/Skybox" />
      <None Include="Assets/_Packages/PaperFoldAsset/FatMachines/TapticFeedback/Plugins/Android/AndroidManifest.xml" />
-     <Folder Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Settings" />
+     <Folder Include="Assets/PaperFold/Settings" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Environment/Smoke" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/Plugins/Android/GoogleMobileAdsPlugin.androidlib" />
@@ -597,6 +597,7 @@
      <Folder Include="Assets/AddressableAssetsData/WebGL" />
      <Folder Include="Assets/AddressableAssetsData/AssetGroups" />
      <Folder Include="Assets/TextMesh Pro/Resources/Style Sheets" />
+     <Folder Include="Assets/DecalToTexture/Fish" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites" />
      <Folder Include="Assets/_Packages/GUI Mobile Hyper-Casual/Sprites/Items PSD + PNG/Bow" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Decals" />
@@ -687,6 +688,7 @@
      <Folder Include="Assets/Epic Toon FX/Prefabs/Combat/Flamethrower/Soft/Alpha Blend" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Combat/Muzzleflash/BulletMuzzle" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Combat/Missiles/Shadow" />
+     <Folder Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Fish" />
      <Folder Include="Assets/Epic Toon FX/Demo/Animation" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Combat/Muzzleflash/GrenadeMuzzle" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Combat/Explosions/FrostExplosion" />

+ 8 - 0
Assets/DecalToTexture/Fish.meta

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

二進制
Assets/DecalToTexture/Fish/Stamped_Image_0.png


+ 121 - 0
Assets/DecalToTexture/Fish/Stamped_Image_0.png.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: 5d8b9b280b6d54102b314c666624dc08
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/DecalToTexture/Fish/Stamped_Image_1.png


+ 121 - 0
Assets/DecalToTexture/Fish/Stamped_Image_1.png.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: b02a7c51b727d4bfa9b897fad4421c26
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 1802 - 101
Assets/PaperFold/Materials/Folding Line.shadergraph


+ 1 - 1
Assets/PaperFold/Scripts/DecalMaster.cs

@@ -140,7 +140,7 @@ public class DecalMaster : MonoBehaviour
 
     private void SaveTexture()
     {
-        JTSystems.Utils.SaveTexture(newTargetObjectTexture, "/DecalToTexture/Created Textures2/");
+        JTSystems.Utils.SaveTexture(newTargetObjectTexture, "/DecalToTexture/Fish/");
     }
 
     private void ConfigureChild(int paperIndex)

+ 1 - 1
Assets/_Packages/PaperFoldAsset/DecalToTexture/Scenes/Paper Maker.unity

@@ -1779,7 +1779,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: f38e990b442124f6bb5fe8fa3976a788, type: 3}
+        m_Texture: {fileID: 2800000, guid: 5068022d774e64742a8cc9d7705aef5b, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

+ 8 - 0
Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Fish.meta

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

二進制
Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Fish/9.png


+ 121 - 0
Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Fish/9.png.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: 5068022d774e64742a8cc9d7705aef5b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Fish/91.png


+ 121 - 0
Assets/_Packages/PaperFoldAsset/Paper Fold/Sprites/Fish/91.png.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: 233adcb71e31640c7b1d3adefb365982
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 0
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 1
+  m_CurrentQuality: 5
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low

+ 9 - 6
UserSettings/EditorUserSettings.asset

@@ -6,25 +6,28 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077d2e626ecf57a19333506a00f073b0f3ae1453907f7123e0e021af40016b1051d18d101
+      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077d2e626ecf57a19333506a00f073b0f3ae145240aff05441e1f07e917
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077c6e235e8eb0e30083c1afb29163b4e0cf10f070ee5443a0a010bef4e3cfe1b16038b0dcb13dc06
+      value: 22424703114646643e0d092c15301037171a1d3a20293f7e38271427fb
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077d2e626ecf57a19333506a00f073b0f3ae145240aff05441e1f07e917
+      value: 224247031146466b0c1e0930362c531459241b2f222d691e283e5d00e1e53a3dacf238e0f323
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646643e0d092c15301037171a1d3a20293f7e38271427fb
+      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077d2e626ecf57a19333506a00f073b0f3ae1453907f7123e0e021af40016b1051d18d101
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 224247031146466b0c1e0930362c531459241b2f222d691e283e5d00e1e53a3dacf238e0f323
+      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241800e1e53a3dacf238e0f323
       flags: 0
     RecentlyUsedScenePath-5:
       value: 224247031146466b0c1e0930362c531459241b2f222d69172c241823eee12d76f7e93ffdfe
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241800e1e53a3dacf238e0f323
+      value: 22424703114646643e0d092c15301020041214252d2c2322633c133af6f9
+      flags: 0
+    RecentlyUsedScenePath-7:
+      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077c6e235e8eb0e30083c1afb29163b4e0cf10f070ee5443a0a010bef4e3cfe1b16038b0dcb13dc06
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7