1
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3cdeeab100a8a584eac4a6d375e73193
|
||||
guid: 97554428056b1ac4f9f32aface985316
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
|
||||
@@ -1143,32 +1143,32 @@ PrefabInstance:
|
||||
- target: {fileID: 3756200637886869943, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7034063
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3756200637886869943, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.086823694
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3756200637886869943, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.70005035
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3756200637886869943, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.08723991
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3756200637886869943, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 89.726
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3756200637886869943, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -14.14
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3761405308027878197, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
@@ -1293,7 +1293,7 @@ PrefabInstance:
|
||||
- target: {fileID: 4919981281746337587, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4926413553594997501, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
@@ -1373,12 +1373,47 @@ PrefabInstance:
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.57
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -2.28
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5767362588169840811, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5775359198218394840, guid: 24f1136b5772c7a428221f9ea1e47092,
|
||||
type: 3}
|
||||
@@ -1941,7 +1976,7 @@ MonoBehaviour:
|
||||
isMove: 1
|
||||
is3D: 0
|
||||
forwordXYZ:
|
||||
fishenum: 0
|
||||
fishenum: 2
|
||||
moveTime: 0
|
||||
yzGroupTimeOffset: 0
|
||||
isyz: 0
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &2405481443112571488
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1994669770593665, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: F4BY_SummonAppear Variant
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4471861886392463, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 15a485e3864a7334dadf9b944805b86b, type: 3}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4af40e2eddac35f4190956bdbad5ef4c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -2226,10 +2226,21 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 召唤卡召唤出的鱼（特殊处理用）：被漩涡卷出来直接放到屏幕中央 = 路线 0.5 位置。
|
||||
/// 之后步骤（漩涡特效等）基于此引用继续处理。
|
||||
/// </summary>
|
||||
private MonsterContral _summonFish;
|
||||
/// <summary>召唤鱼 guid（= 服务端 fishId.ToString()）：Notice 比 OnFishSpawn 先到时记录，等鱼建出来再检索</summary>
|
||||
private string _summonFishGuid;
|
||||
|
||||
/// <summary>
|
||||
/// 服务端 SummonCardFishNotice 房间广播回调：某玩家使用召唤卡，服务端已创建召唤鱼。
|
||||
/// 仅播放召唤提示（飞机场召唤Boss鱼，其他场次召唤黄金鱼），
|
||||
/// 实际鱼对象由服务端 OnFishSpawn 下发创建，这里不重复生成鱼。
|
||||
/// ⭐ 特殊处理：检索出这条召唤鱼保存引用，并把开始时间加整体时间的一半
|
||||
/// （moveTime = 总时长 * 0.5），让鱼直接出现在路线 0.5 位置（屏幕中央），
|
||||
/// 之后从中间继续向终点游，剩余存活时长自动减半。
|
||||
/// </summary>
|
||||
public void OnSummonCardFishNotice(SummonCardFishNoticeData data)
|
||||
{
|
||||
@@ -2238,6 +2249,62 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
|
||||
? (data.fishType == 2 ? "Boss鱼" : "黄金鱼")
|
||||
: data.fishTypeName;
|
||||
UIManager.Instance.ShowBoardError($"{data.userName} 使用召唤卡召唤了一条{fishName}");
|
||||
|
||||
// ⭐ 检索召唤鱼：guid = 服务端 fishId.ToString()（与 fishDatas_hashCodekey 的 key 一致）
|
||||
_summonFishGuid = data.fishId.ToString();
|
||||
_summonFish = null;
|
||||
if (TryGetSummonFish(_summonFishGuid, out var monster))
|
||||
{
|
||||
ApplySummonFishCenterSpawn(monster);
|
||||
}
|
||||
else
|
||||
{
|
||||
// OnFishSpawn 还没建出这条鱼（Notice 先到）：轮询等鱼建出来再处理
|
||||
StartCoroutine(WaitSummonFishAndCenterSpawn(_summonFishGuid));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>按 guid 检索召唤鱼（guid = 服务端 fishId.ToString()，OnFishSpawn 建鱼时写入）</summary>
|
||||
private bool TryGetSummonFish(string guid, out MonsterContral monster)
|
||||
{
|
||||
monster = null;
|
||||
if (string.IsNullOrEmpty(guid)) return false;
|
||||
var dict = CreateFishManager.Instance?.fishDatas_hashCodekey;
|
||||
if (dict == null) return false;
|
||||
if (!dict.TryGetValue(guid, out var m) || m == null) return false;
|
||||
monster = m;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>等待 OnFishSpawn 建出召唤鱼后应用中点出生（Notice 比 OnFishSpawn 先到的时序兜底；guid 变了说明来了新召唤，协程作废）</summary>
|
||||
private IEnumerator WaitSummonFishAndCenterSpawn(string guid)
|
||||
{
|
||||
float timeout = Time.time + 5f; // 最多等 5 秒（服务端 OnFishSpawn 正常几百毫秒内到）
|
||||
while (Time.time < timeout && _summonFishGuid == guid)
|
||||
{
|
||||
if (TryGetSummonFish(guid, out var monster))
|
||||
{
|
||||
ApplySummonFishCenterSpawn(monster);
|
||||
yield break;
|
||||
}
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 召唤鱼特殊处理：保存引用 + 开始时间加整体时间的一半。
|
||||
/// moveTime 初始 = moveLine.moveTime * 0.5 → 鱼直接出现在路线 0.5 位置（屏幕中央），
|
||||
/// 之后从中间继续向终点游（moveTime 继续累计，走满总时长离场）。
|
||||
/// isMove=false 的鱼不走路线（固定位置播动画），跳过偏移。
|
||||
/// </summary>
|
||||
private void ApplySummonFishCenterSpawn(MonsterContral monster)
|
||||
{
|
||||
_summonFish = monster;
|
||||
if (monster == null || !monster.isMove) return;
|
||||
var moveLine = monster.monsterData?.moveLine;
|
||||
if (moveLine == null || moveLine.moveTime <= 0f) return;
|
||||
// ⭐ 开始时间 = 0 + 整体时间的一半 → 直接放在路线 0.5（屏幕中央）
|
||||
monster.moveTime = moveLine.moveTime * 0.5f;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a48c3d1a2b8a04945b89de63d1d2943c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ad70aa71b8c526447b85dca2749ff254
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,473 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Effect_zhaohuan_2
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: -0.2307692
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.166667
|
||||
value: 0
|
||||
inSlope: 2.1811642E-08
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x407A9C87_NUtNwQL
|
||||
path: Particle System/zhuan01
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: -0.2142857
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0
|
||||
inSlope: -2.3644247E-08
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x407A9C87_NUtNwQL
|
||||
path: Particle System/heidi
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: -0.25
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x407A9C87_NUtNwQL
|
||||
path: Particle System/zhuan02
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x4757EA7B_iWoUKoN
|
||||
path: Particle System/zhuan01
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x80D04E91_LnnnQvJ
|
||||
path: Particle System/zhuan01
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0xE0954DEE_muqpljH
|
||||
path: Particle System/zhuan01
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x4757EA7B_iWoUKoN
|
||||
path: Particle System/heidi
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x80D04E91_LnnnQvJ
|
||||
path: Particle System/heidi
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0xE0954DEE_muqpljH
|
||||
path: Particle System/heidi
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x4757EA7B_iWoUKoN
|
||||
path: Particle System/zhuan02
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0x80D04E91_LnnnQvJ
|
||||
path: Particle System/zhuan02
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 2.333333
|
||||
value: 0.5
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 1
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: typetree_0xE0954DEE_muqpljH
|
||||
path: Particle System/zhuan02
|
||||
classID: 199
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves: []
|
||||
m_SampleRate: 30
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 3895720108
|
||||
attribute: 1081777287
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3919698376
|
||||
attribute: 1081777287
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1899669782
|
||||
attribute: 1081777287
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3895720108
|
||||
attribute: 1196943995
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3895720108
|
||||
attribute: 2161135249
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3895720108
|
||||
attribute: 3767881198
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3919698376
|
||||
attribute: 1196943995
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3919698376
|
||||
attribute: 2161135249
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 3919698376
|
||||
attribute: 3767881198
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1899669782
|
||||
attribute: 1196943995
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1899669782
|
||||
attribute: 2161135249
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1899669782
|
||||
attribute: 3767881198
|
||||
script: {fileID: 0}
|
||||
typeID: 199
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 2.333333
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 0
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
@@ -0,0 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4b640ea8c1602a348b1be38fc080c519
|
||||
timeCreated: 1766415514
|
||||
licenseType: Free
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName: f4by_animation
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,71 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
serializedVersion: 5
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Effect_zhaohuan_2
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
m_StateMachine: {fileID: 1107892040473025769}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 0
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
--- !u!1107 &1107892040473025769
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Base Layer
|
||||
m_ChildStates:
|
||||
- m_State: {fileID: 1102747600913437635}
|
||||
m_Position: {x: 0, y: 0, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions: {}
|
||||
m_StateMachineBehaviours: []
|
||||
m_AnyStatePosition: {x: 0, y: -100, z: 0}
|
||||
m_EntryPosition: {x: 250, y: -100, z: 0}
|
||||
m_ExitPosition: {x: 500, y: -100, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
|
||||
m_DefaultState: {fileID: 1102747600913437635}
|
||||
--- !u!1102 &1102747600913437635
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Effect_zhaohuan
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 0, y: 0, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: 4b640ea8c1602a348b1be38fc080c519, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
@@ -0,0 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c43a4ef1203c6564db34fef048dba8ff
|
||||
timeCreated: 1766415472
|
||||
licenseType: Free
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName: f4by_animation
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5c19fdf5398a81744ba273299cbf2fb4
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dbf87bcf2520d5643bf023e194d7ec01
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4b12e71073a5bbf4885e46521a2d4ffe
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 92566ca6e0701b948a5447603b6a0421
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,35 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: ef_guangmang0130
|
||||
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||
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:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 9a2580af97c700b4aa5d000cd64dc98b, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _InvFade: 1
|
||||
m_Colors:
|
||||
- _TintColor: {r: 0.18867922, g: 0.1682093, b: 0.1682093, a: 0.5}
|
||||
m_BuildTextureStacks: []
|
||||
@@ -0,0 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 69ba07cbf282e5b438e9267457b0e5d2
|
||||
timeCreated: 1766415512
|
||||
licenseType: Free
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName: f4by_fishmodel
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c3ce98249b9f2fd4fac173683902af5f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f0c845dba7a2b9244856ab176f5ebaf8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 15a485e3864a7334dadf9b944805b86b
|
||||
timeCreated: 1766415508
|
||||
licenseType: Free
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
addedObjectFileIDs:
|
||||
isPrefabVariant: 0
|
||||
unableToImportOnPreviousDomainReload: 0
|
||||
userData:
|
||||
assetBundleName: f4by_prefab
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user