Compare commits

..

No commits in common. "50ad57bb03a08200d87ed5db19774e281bd7392c" and "6c4d5964a869d91a8edaae0742eed79c1d3fe94b" have entirely different histories.

22 changed files with 7254 additions and 8607 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: bb1468325a935b44ca6d70f15272cd91 guid: ae4c7da5a394bea4ab264d6b8592bd41
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ae4c7da5a394bea4ab264d6b8592bd41
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@ -1049,8 +1049,8 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 206378383
m_SortingOrder: 20 m_SortingOrder: 2
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!1 &748323560309116558 --- !u!1 &748323560309116558
GameObject: GameObject:
@ -36769,8 +36769,8 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 206378383
m_SortingOrder: 20 m_SortingOrder: 2
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!1 &2816647308553280720 --- !u!1 &2816647308553280720
GameObject: GameObject:
@ -78053,8 +78053,8 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 206378383
m_SortingOrder: 20 m_SortingOrder: 2
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!1 &7031927170101600824 --- !u!1 &7031927170101600824
GameObject: GameObject:
@ -78192,8 +78192,8 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 206378383
m_SortingOrder: 20 m_SortingOrder: 2
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!1 &7806227272718274905 --- !u!1 &7806227272718274905
GameObject: GameObject:
@ -93390,8 +93390,8 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 206378383
m_SortingOrder: 20 m_SortingOrder: 2
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!1 &8815047430527190813 --- !u!1 &8815047430527190813
GameObject: GameObject:

View File

@ -31,16 +31,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -62,7 +53,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 854 value: 779
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -70,7 +61,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 1
value: 300 value: 300
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -78,15 +69,6 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 854
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
@ -101,7 +83,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 399 value: 364
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -109,7 +91,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 1
value: 140 value: 140
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -117,15 +99,6 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 399
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
@ -175,7 +148,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 0.6666667 m_StopTime: 1
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
@ -205,16 +178,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -236,7 +200,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 854 value: 779
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -244,7 +208,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 1
value: 300 value: 300
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -252,15 +216,6 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 854
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
@ -275,7 +230,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 399 value: 364
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -283,7 +238,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.33333334 time: 1
value: 140 value: 140
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@ -291,15 +246,6 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 399
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4

View File

@ -159,7 +159,7 @@ namespace GameLogic
private void AddMyPush() private void AddMyPush()
{ {
// 最终结果值 = 初始推力+玩家数量 + 永久增加推力值 // 最终结果值 = 初始推力+玩家数量 + 永久增加推力值
m_AddPush = EventConts.InitPower + (m_ListUnitPlayDatas.Count * EventConts.PlayerScale) + m_AllAddPush ; m_AddPush = EventConts.InitPower + m_ListUnitPlayDatas.Count + m_AllAddPush;
foreach (var item in m_Buffs) foreach (var item in m_Buffs)
{ {
@ -507,9 +507,6 @@ namespace GameLogic
// 特效播放完毕后销毁 // 特效播放完毕后销毁
GameObject.Destroy(eGo); GameObject.Destroy(eGo);
}); });
// 永久增加推力
m_AllAddPush += ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).YongJiuPower;
} }
else if (buff.m_Id == 9) else if (buff.m_Id == 9)
{ {

View File

@ -12,7 +12,6 @@ namespace GameLogic
public static int MaxPlayerIds = 23; // 最多九个位置 public static int MaxPlayerIds = 23; // 最多九个位置
public static int InitPower = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).InitPower; // 初始推力 public static int InitPower = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).InitPower; // 初始推力
public static float PlayerScale = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).PlayerScale; // 初始推力
public static string GmPass = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).GmPassworld; // Gm解锁密码 public static string GmPass = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).GmPassworld; // Gm解锁密码
public static bool isGmPass = false; // 是否解锁 public static bool isGmPass = false; // 是否解锁
public const int isZoneTimerBuffId = 6;// 特殊Buff public const int isZoneTimerBuffId = 6;// 特殊Buff

View File

@ -129,14 +129,14 @@ public class DataGameModelManager : GameBase.Singleton<DataGameModelManager>
postPlayRankData.name = item.Value.protCustMessageData.nickName; postPlayRankData.name = item.Value.protCustMessageData.nickName;
postPlayRankData.score = item.Value.m_Score; postPlayRankData.score = item.Value.m_Score;
postPlayRankData.pay = 0; postPlayRankData.pay = 0;
postPlayRankData.winCount = item.Value.m_GongXian + (item.Value.m_GongXianScore / 10000); postPlayRankData.winCount = item.Value.m_GongXian + (item.Value.m_GongXianScore % 10000);
postPlayRankData.useClientData = "1"; postPlayRankData.useClientData = "1";
postPlayRankData.avatar = item.Value.protCustMessageData.imgURL; postPlayRankData.avatar = item.Value.protCustMessageData.imgURL;
postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp; postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp;
postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv; postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv;
postPlayRankData.campName = DataGameSceneManager.Instance.GetStrs(int.Parse(item.Value.teamId) - 1); postPlayRankData.campName = DataGameSceneManager.Instance.GetStrs(int.Parse(item.Value.teamId) - 1);
Log.Debug("玩家:{0},贡献积分分配{1}", item.Value.protCustMessageData.nickName, (item.Value.m_GongXianScore / 10000)); Log.Debug("玩家:{0},贡献积分分配{1}", item.Value.protCustMessageData.nickName, (item.Value.m_GongXianScore % 10000));
rankInfos.Add(postPlayRankData); rankInfos.Add(postPlayRankData);
} }

View File

@ -317,8 +317,8 @@ namespace GameLogic
// 触发检测朝代变换 // 触发检测朝代变换
CheckGameValue(); CheckGameValue();
//// 动态计算公用胜点池 // 动态计算公用胜点池
//WinAllValue = (long)Math.Ceiling(ScoreAllValue * 0.00001f); WinAllValue = (long)Math.Ceiling(ScoreAllValue * 0.00001f);
//Log.Error($"添加礼物:{giftId}"); //Log.Error($"添加礼物:{giftId}");
@ -900,7 +900,7 @@ namespace GameLogic
// 添加减速Buff给到 // 添加减速Buff给到
var eGo = GameModule.Resource.LoadGameObject("JSZ"); var eGo = GameModule.Resource.LoadGameObject("JSZ");
eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[1].GetRect().transform); eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[1].GetRect().transform);
eGo.transform.localPosition = new Vector3(0, 0, 0); eGo.transform.localPosition = new Vector3(300, 140, 0);
eGo.transform.localScale = Vector3.one * 0.5f; eGo.transform.localScale = Vector3.one * 0.5f;
// 移动特效 // 移动特效
@ -916,7 +916,7 @@ namespace GameLogic
// 添加减速Buff给到 // 添加减速Buff给到
var eGo = GameModule.Resource.LoadGameObject("JSZ"); var eGo = GameModule.Resource.LoadGameObject("JSZ");
eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[0].GetRect().transform); eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[0].GetRect().transform);
eGo.transform.localPosition = new Vector3(0, 0, 0); eGo.transform.localPosition = new Vector3(300, 140, 0);
eGo.transform.localScale = Vector3.one * 0.5f; eGo.transform.localScale = Vector3.one * 0.5f;
// 移动特效 // 移动特效

View File

@ -21,8 +21,6 @@ public sealed partial class SystemConfig : Luban.BeanBase
ActorMaxScale = _buf.ReadInt(); ActorMaxScale = _buf.ReadInt();
MaxPlayerId = _buf.ReadInt(); MaxPlayerId = _buf.ReadInt();
InitPower = _buf.ReadInt(); InitPower = _buf.ReadInt();
YongJiuPower = _buf.ReadInt();
PlayerScale = _buf.ReadFloat();
GmPassworld = _buf.ReadString(); GmPassworld = _buf.ReadString();
} }
@ -52,14 +50,6 @@ public sealed partial class SystemConfig : Luban.BeanBase
/// </summary> /// </summary>
public readonly int InitPower; public readonly int InitPower;
/// <summary> /// <summary>
/// 永久推力
/// </summary>
public readonly int YongJiuPower;
/// <summary>
/// 玩家系数
/// </summary>
public readonly float PlayerScale;
/// <summary>
/// Gm解锁密码 /// Gm解锁密码
/// </summary> /// </summary>
public readonly string GmPassworld; public readonly string GmPassworld;
@ -79,8 +69,6 @@ public sealed partial class SystemConfig : Luban.BeanBase
+ "ActorMaxScale:" + ActorMaxScale + "," + "ActorMaxScale:" + ActorMaxScale + ","
+ "MaxPlayerId:" + MaxPlayerId + "," + "MaxPlayerId:" + MaxPlayerId + ","
+ "InitPower:" + InitPower + "," + "InitPower:" + InitPower + ","
+ "YongJiuPower:" + YongJiuPower + ","
+ "PlayerScale:" + PlayerScale + ","
+ "GmPassworld:" + GmPassworld + "," + "GmPassworld:" + GmPassworld + ","
+ "}"; + "}";
} }

View File

@ -1,616 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8294013845605418285
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 1
m_InfiniteClipPostExtrapolation: 1
m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 295}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
mInfiniteClipLoop: 0
m_MatchTargetFields: 63
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: -5758782885385850353}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!74 &-5758782885385850353
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 854
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 300
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 854
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 399
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 140
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 399
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.y
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 224
script: {fileID: 0}
flags: 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: 0
attribute: 1460864421
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 538195251
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2033536083
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.6666667
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:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 854
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 300
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 854
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 399
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 140
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 399
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.y
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 224
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path:
classID: 224
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 224
script: {fileID: 0}
flags: 16
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
classID: 224
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: JSZ_Timeline
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: -8294013845605418285}
- {fileID: 1194525926190364986}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 30
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &1194525926190364986
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
m_Name: Control Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0.3
m_ClipIn: 0
m_Asset: {fileID: 8923842764252959784}
m_Duration: 0.36666666666666664
m_TimeScale: 1
m_ParentTrack: {fileID: 1194525926190364986}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: JSZ_Boom
m_Markers:
m_Objects: []
--- !u!114 &8923842764252959784
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48853ae485fa386428341ac1ea122570, type: 3}
m_Name: ControlPlayableAsset
m_EditorClassIdentifier:
sourceGameObject:
exposedName: 0e4db673bae85a1489fa3fb438b61f64
defaultValue: {fileID: 0}
prefabGameObject: {fileID: 0}
updateParticle: 1
particleRandomSeed: 4908
updateDirector: 1
updateITimeControl: 1
searchHierarchy: 0
active: 1
postPlayback: 2

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6dee109802ca3bc4fa462c67ea1dce37
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff