最新制作提交

This commit is contained in:
高铎 2025-09-24 11:31:11 +08:00
parent d52bea670e
commit 369ba2cdb8
20 changed files with 353 additions and 95 deletions

View File

@ -46,7 +46,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_Start: 0.016666666666666666
m_ClipIn: 0.4666666666666667
m_Asset: {fileID: 2173159791301604241}
m_Duration: 0.32500000000000007
@ -112,7 +112,7 @@ MonoBehaviour:
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 0
m_PreExtrapolationTime: 0.016666666666666666
m_DisplayName: Take 001
m_Markers:
m_Objects: []
@ -148,14 +148,15 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: 1150961415269729823}
- {fileID: 5280067682064400094}
- {fileID: -331109556353995784}
- {fileID: 6585408633701472423}
- {fileID: 826174166203168261}
- {fileID: 1495856355338435601}
- {fileID: 4877647383765093358}
- {fileID: 8801064865696138202}
- {fileID: -9153701530900657781}
- {fileID: 5228063916436333575}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@ -284,30 +285,6 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &1150961415269729823
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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation 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_PostPlaybackState: 3
--- !u!114 &1495856355338435601
MonoBehaviour:
m_ObjectHideFlags: 1
@ -423,6 +400,30 @@ MonoBehaviour:
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &3162983057813462339
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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &3795942952542207640
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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &4242392994248133960
MonoBehaviour:
m_ObjectHideFlags: 1
@ -467,10 +468,10 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_Start: 0.016666666666666666
m_ClipIn: 0
m_Asset: {fileID: 510564080464500399}
m_Duration: 0.3333333333333333
m_Duration: 0.32500000000000007
m_TimeScale: 1
m_ParentTrack: {fileID: 4877647383765093358}
m_EaseInDuration: 0
@ -538,6 +539,99 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &5228063916436333575
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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation 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
m_ClipIn: 0
m_Asset: {fileID: 3795942952542207640}
m_Duration: 0.016666666666666666
m_TimeScale: 1
m_ParentTrack: {fileID: 5228063916436333575}
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: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &5280067682064400094
MonoBehaviour:
m_ObjectHideFlags: 1
@ -560,10 +654,10 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_Start: 0.016666666666666666
m_ClipIn: 0
m_Asset: {fileID: 6258543010659067928}
m_Duration: 0.3333333333333333
m_Duration: 0.32500000000000007
m_TimeScale: 1
m_ParentTrack: {fileID: 5280067682064400094}
m_EaseInDuration: 0
@ -643,6 +737,99 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &6585408633701472423
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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (5)
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.016666666666666666
m_ClipIn: 0
m_Asset: {fileID: 3162983057813462339}
m_Duration: 0.32500000000000007
m_TimeScale: 1
m_ParentTrack: {fileID: 6585408633701472423}
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: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &7642338151924403047
MonoBehaviour:
m_ObjectHideFlags: 1

View File

@ -56,6 +56,13 @@ public class RongMaoSkinMesh : MonoBehaviour
isInit = Init();
}
//更新毛发渲染
private void Update()
{
if (skinHasValue)
{
skinnedMeshRenderer.BakeMesh(mesh);
}
}
void LateUpdate()
{
//目标为空就不渲染
@ -143,10 +150,7 @@ public class RongMaoSkinMesh : MonoBehaviour
void UpDateInstance()
{
if (skinHasValue)
{
skinnedMeshRenderer.BakeMesh(mesh);
}
for (int i = 0; i < LayerCount; i++)
{
instanceMatrices[i] = target.transform.localToWorldMatrix;
@ -157,10 +161,10 @@ public class RongMaoSkinMesh : MonoBehaviour
//未使用GPU实例化
void UpDateMesh()
{
if (skinHasValue)
{
skinnedMeshRenderer.BakeMesh(mesh);
}
//if (skinHasValue)
//{
// skinnedMeshRenderer.BakeMesh(mesh);
//}
layerMat.DisableKeyword("INSTANCE");
float furOffset = 1.0f / LayerCount;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -64922,8 +64922,6 @@ PlayableDirector:
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
- key: {fileID: 1150961415269729823, guid: 490195d0c2c0b1147bed32c20037e656, type: 2}
value: {fileID: 1842047664}
- key: {fileID: 5280067682064400094, guid: 490195d0c2c0b1147bed32c20037e656, type: 2}
value: {fileID: 897224936}
- key: {fileID: -331109556353995784, guid: 490195d0c2c0b1147bed32c20037e656, type: 2}
@ -64938,6 +64936,10 @@ PlayableDirector:
value: {fileID: 2082519387}
- key: {fileID: -9153701530900657781, guid: 490195d0c2c0b1147bed32c20037e656, type: 2}
value: {fileID: 1623308590}
- key: {fileID: 5228063916436333575, guid: 490195d0c2c0b1147bed32c20037e656, type: 2}
value: {fileID: 1842047664}
- key: {fileID: 6585408633701472423, guid: 490195d0c2c0b1147bed32c20037e656, type: 2}
value: {fileID: 942457368}
m_ExposedReferences:
m_References: []
--- !u!114 &1561347668
@ -104735,6 +104737,11 @@ PrefabInstance:
propertyPath: MainTex
value:
objectReference: {fileID: 2800000, guid: 48efe854dfe8c274fac2bab3b5762fda, type: 3}
- target: {fileID: 7272785262801721381, guid: c42ca1dac4e598d439d97bc5398228f8,
type: 3}
propertyPath: isInStance
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c42ca1dac4e598d439d97bc5398228f8, type: 3}
--- !u!1 &4002677323983680167 stripped

View File

@ -6,42 +6,52 @@ namespace DongWuYiXue.QiGuanChaGuan
public class BaoLuHuiYanState : FsmState<FSMManager>
{
bool isChaRu;
float chaRuValue;
Coroutine cor;
public override void OnStateEnter()
{
base.OnStateEnter();
this.Log("进入暴露会厌状态");
isChaRu = false;
chaRuValue = 0;
fsm.ShowCamera("暴露会厌_Camera");
fsm.ShowTip(1);
fsm.PlayBgm(1);
cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
{
//cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
//{
isChaRu = true;
});
//});
}
public override void OnStateStay()
{
base.OnStateStay();
if (isChaRu)
{
isChaRu = false;
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
{
if (Input.GetKeyDown(KeyCode.L))
{
fsm.AddScore(6, 0);
chaRuValue = 1;
}
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.AddScore(6, 0);
}
fsm.PlayClip("±©Â¶»áÑá_TimeLine", () =>
fsm.PlayClip("±©Â¶»áÑá_TimeLine", null, chaRuValue);
if (chaRuValue >= 1.0f)
{
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
{
fsm.AddScore(6, 0);
}
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.AddScore(6, 0);
}
isChaRu = false;
chaRuValue = 0;
fsm.nextState = true;
});
}
}
}
public override void OnStateExit()
{
base.OnStateExit();
chaRuValue = 0;
isChaRu = false;
if (null != cor)
{

View File

@ -6,36 +6,37 @@ namespace DongWuYiXue.QiGuanChaGuan
public class ChaRuQiGuanDaoGuanState : FsmState<FSMManager>
{
bool isChaRu;
float chaRuValue;
Coroutine cor;
public override void OnStateEnter()
{
base.OnStateEnter();
this.Log("½øÈë²åÈëÆø¹Üµ¼¹Ü״̬");
isChaRu = false;
chaRuValue = 0;
fsm.ShowCamera("²åÈëÆø¹Üµ¼¹Ü_Camera");
fsm.ShowTip(1);
fsm.PlayBgm(1);
cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
{
//cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
//{
isChaRu = true;
});
//});
}
public override void OnStateStay()
{
base.OnStateStay();
if (isChaRu)
{
isChaRu = false;
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
if (Input.GetKeyDown(KeyCode.L))
{
fsm.AddScore(8, 0);
chaRuValue = 1;
}
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.AddScore(6, 0);
}
fsm.PlayClip("²åÈëÆø¹Üµ¼¹Ü_TimeLine", () =>
fsm.PlayClip("²åÈëÆø¹Üµ¼¹Ü_TimeLine", null, chaRuValue);
if (chaRuValue >= 1.0f)
{
isChaRu = false;
chaRuValue = 0;
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.ShowTxtQuestion(3, 3, 1, () =>
@ -45,15 +46,25 @@ namespace DongWuYiXue.QiGuanChaGuan
}
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
{
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
{
fsm.AddScore(8, 0);
}
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.AddScore(6, 0);
}
fsm.nextState = true;
}
});
}
}
}
public override void OnStateExit()
{
base.OnStateExit();
isChaRu = false;
chaRuValue = 0;
if (null != cor)
{
Game.Instance.IEnumeratorManager.Stop(cor);

View File

@ -12,42 +12,52 @@ namespace DongWuYiXue.QiGuanChaGuan
Coroutine cor;
float openValue;
public override void OnStateEnter()
{
base.OnStateEnter();
this.Log("½øÈë´ò¿ª¿Úǻ״̬");
isOpen = false;
openValue = 0;
fsm.ShowCamera("´ò¿ª¿ÚÇ»1_Camera");
fsm.ShowTip(1);
fsm.PlayBgm(1);
cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
{
openValue = 0;
//cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
//{
isOpen = true;
});
//});
}
public override void OnStateStay()
{
base.OnStateStay();
if (isOpen)
{
isOpen = false;
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
{
if (Input.GetKeyDown(KeyCode.L))
{
fsm.AddScore(6, 0);
openValue = 1;
}
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.AddScore(6, 0);
}
fsm.PlayClip("´ò¿ª¿ÚÇ»1_TimeLine", () =>
fsm.PlayClip("´ò¿ª¿ÚÇ»1_TimeLine", null, openValue);
if (openValue >= 1.0f)
{
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
{
fsm.AddScore(6, 0);
}
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
{
fsm.AddScore(6, 0);
}
isOpen = false;
openValue = 0;
fsm.nextState = true;
});
}
}
}
public override void OnStateExit()
{
base.OnStateExit();
openValue = 0;
isOpen = false;
if (null != cor)
{

View File

@ -37,14 +37,43 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationCompression: 0
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 0
firstFrame: 1
lastFrame: 60
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []

View File

@ -188,7 +188,7 @@ PlayerSettings:
APKExpansionFiles: 0
keepLoadedShadersAlive: 0
StripUnusedMeshComponents: 0
VertexChannelCompressionMask: 4054
VertexChannelCompressionMask: 0
iPhoneSdkVersion: 988
iOSTargetOSVersionString: 11.0
tvOSSdkVersion: 0