李桃 1 hónapja
szülő
commit
9afa1cbb14

+ 7 - 1
Assets/Art/HeroTimeLine/gf_1403_timeline.playable

@@ -37,6 +37,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-6294263169139892121
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -934,6 +936,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &3331818650164900359
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1041,7 +1045,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: -5073625934344026965}
@@ -1328,6 +1332,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &8106544261917024806
 MonoBehaviour:
   m_ObjectHideFlags: 1

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 4901
Assets/Art/VFX/FXPrefabs/fx_gf1403_sf.prefab


+ 100 - 0
Assets/Art/VFX/Materials/fx_rao_1403 1.mat

@@ -0,0 +1,100 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_rao_1403 1
+  m_Shader: {fileID: 4800000, guid: 35651c764ad8f1445ac0d4d1a685e858, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: _TextureGao
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 9d427d3b4ed200c46bf4d00f26b55ef8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Noise94:
+        m_Texture: {fileID: 2800000, guid: bfcfae059f1e1884f97acc795fe3af1b, type: 3}
+        m_Scale: {x: 0.63, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _RJraodong:
+        m_Texture: {fileID: 2800000, guid: 8dd972cbb6cdc024a9da718d46ea3dfc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Rj2Tex:
+        m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TextureGao:
+        m_Texture: {fileID: 2800000, guid: be2dad9cf95ef434aada790911eaf0ff, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _rj2:
+        m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaCutoff: 0.5
+    - _AlphaQD: 1
+    - _CTime: 1
+    - _CustomDataDissolve: 0
+    - _Diss_value: 0.36
+    - _Float0: 0.6
+    - _Float2: 0.684
+    - _Float3: 0.323
+    - _Float4: 0
+    - _Float7: 0.21
+    - _Float8: 0.118
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RJ1soft: 0
+    - _RJ2soft: 0
+    - _RJraodongqd: 0
+    - _RJraodongsd: 0
+    - _ReceiveShadows: 1
+    - _Soft_value: 0
+    - _light: 1
+    - _soft: 0
+    m_Colors:
+    - _Color0: {r: 0.2051282, g: 0.923077, b: 1, a: 1}
+    - _ColorGG: {r: 1, g: 1, b: 1, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Main_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/VFX/Materials/fx_rao_1403 1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CnIf4CqkU3yCuEF7s4dm11IEK9CIaLftrxPdAraEo/sM2pVnRmw834b5LmOo
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 11
Assets/Art/VFX/Materials/fx_rao_1403.mat

@@ -24,12 +24,12 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _Main_Tex:
-        m_Texture: {fileID: 2800000, guid: 0f7f86e5620e97f4caac712a0eb0f4aa, type: 3}
-        m_Scale: {x: 1, y: 1}
+        m_Texture: {fileID: 2800000, guid: 78d457612dea5bd4393638ba48100a59, type: 3}
+        m_Scale: {x: 0.8, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Mask:
-        m_Texture: {fileID: 2800000, guid: 39d09d16ddfb4c34181dd4ecc70d2531, type: 3}
-        m_Scale: {x: 1, y: 1}
+        m_Texture: {fileID: 2800000, guid: c686d1456884a444fb9e9e5bc57235c0, type: 3}
+        m_Scale: {x: 0.5, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Noise94:
         m_Texture: {fileID: 2800000, guid: bfcfae059f1e1884f97acc795fe3af1b, type: 3}
@@ -52,9 +52,9 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _dissolve:
-        m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Texture: {fileID: 2800000, guid: ed03ebad7dbda1d49b4b879ae969f4a0, type: 3}
+        m_Scale: {x: 0.91, y: 0.69}
+        m_Offset: {x: 0.3, y: 0}
     - _rj2:
         m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -81,8 +81,8 @@ Material:
     - _AlphaCutoff: 0.5
     - _AlphaQD: 1
     - _CTime: 1
-    - _CustomDataDissolve: 0
-    - _CustomDataMainUV: 0
+    - _CustomDataDissolve: 1
+    - _CustomDataMainUV: 1
     - _Diss_value: 0
     - _Float0: 0.6
     - _Float2: 0.684
@@ -100,14 +100,14 @@ Material:
     - _Soft_value: 0
     - _Turb_Value: 0
     - _ca: 1
-    - _light: 1
+    - _light: 1.2
     - _soft: 0
     m_Colors:
     - _Color0: {r: 0.2051282, g: 0.923077, b: 1, a: 1}
     - _ColorGG: {r: 1, g: 1, b: 1, a: 1}
     - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Main_Color: {r: 8, g: 8, b: 8, a: 1}
+    - _Main_Color: {r: 3.8679237, g: 2.6877584, b: 2.5102825, a: 1}
     - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
     - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
     - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}

BIN
Assets/Art/VFX/Textures/fx_1403_red.png


+ 133 - 0
Assets/Art/VFX/Textures/fx_1403_red.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CHJLsS+qVXpisrW3TS1e8+xwrJx5Xxf+7e/KKI1cV/HlIOFeM+Gu885Sp2Sw
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 326 - 146
Assets/Art/cs3.scene


BIN
美术/art_use_ui/tongyong/dec_ty_yuan.png


BIN
美术/参考/战斗界面/战斗界面.png


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott