Browse Source

美术资源

李桃 2 months ago
parent
commit
b8a9dc1701

+ 3 - 3
Assets/Art/HeroTimeLine/jianjue_timeline.playable → Assets/Art/HeroTimeLine/gf_jianjue_timeline.playable

@@ -194,7 +194,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
-  m_Name: jianjue_timeline
+  m_Name: gf_jianjue_timeline
   m_EditorClassIdentifier: 
   m_Version: 0
   m_Tracks:
@@ -220,7 +220,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: e92d357ee84422d45a75560dcaefaf37
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 6332388962195594806, guid: f60c2a0d175ad5641bef6998a6383163, type: 3}
+  prefabGameObject: {fileID: 6784858351995289862, guid: b470a31c532d0bf40a09986218ae3b52, type: 3}
   updateParticle: 1
   particleRandomSeed: 518
   updateDirector: 1
@@ -436,6 +436,6 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_huoqiu
+    m_DisplayName: fx_gf_jianjue
   m_Markers:
     m_Objects: []

+ 0 - 0
Assets/Art/HeroTimeLine/jianjue_timeline.playable.meta → Assets/Art/HeroTimeLine/gf_jianjue_timeline.playable.meta


+ 3 - 3
Assets/Art/HeroTimeLine/lieyanjian_timeline.playable → Assets/Art/HeroTimeLine/gf_lieyanjian_timeline.playable

@@ -89,7 +89,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_huoqiu
+    m_DisplayName: fx_gf_lieyanjian
   m_Markers:
     m_Objects: []
 --- !u!114 &-5073625934344026965
@@ -157,7 +157,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 06f144804f7ec7342a023f1e18a025af
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 6332388962195594806, guid: f60c2a0d175ad5641bef6998a6383163, type: 3}
+  prefabGameObject: {fileID: 3406478517066756076, guid: ea181fbbeb562ee4ea001111cfa2b819, type: 3}
   updateParticle: 1
   particleRandomSeed: 518
   updateDirector: 1
@@ -282,7 +282,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
-  m_Name: lieyanjian_timeline
+  m_Name: gf_lieyanjian_timeline
   m_EditorClassIdentifier: 
   m_Version: 0
   m_Tracks:

+ 0 - 0
Assets/Art/HeroTimeLine/lieyanjian_timeline.playable.meta → Assets/Art/HeroTimeLine/gf_lieyanjian_timeline.playable.meta


+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_lieyanjian.prefab

@@ -19490,7 +19490,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  hitFxName: fx_gf_jianjue_hit
+  hitFxName: fx_gf_lieyanjian_hit
   hitAudioName: 
   isPenetrate: 0
   isUseCustomTargetEndPos: 0

+ 1 - 1
Assets/Res/TimeLineAssets/jianjue_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"jianjue_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"jianjue\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"jianjue\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"jianjue\",\"isActivity\":false,\"startTime\":0.4333333,\"endTime\":1.433333,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"jianjue_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"jianjue_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"jianjue\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"jianjue\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jianjue\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"jianjue\",\"isActivity\":false,\"startTime\":0.4333333,\"endTime\":1.433333,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"jianjue_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 1 - 1
Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"lieyanjian_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0.4333333,\"endTime\":1.433333,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"lieyanjian_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"lieyanjian_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_lieyanjian\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0.4333333,\"endTime\":1.433333,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"lieyanjian_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5207575055075d580f595a2046720d44431619287b2e71637e7f4b67e4e5626e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

Some files were not shown because too many files changed in this diff