Soullies/Continentis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyword + animation

Browse Source
This commit is contained in:
SoulliesOfficial
2025-10-27 07:04:34 -04:00
parent c3c4a17440
commit 2906206f0c
40 changed files with 512 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_DualStrike.asset
View File

@@ -17,8 +17,10 @@ MonoBehaviour:
displayName: Card_Basic_DualStrike_DisplayName
cardRarity: 10
cardType: 0
tags: []
keywords:
- Strike
cardSprite: {fileID: 21300000, guid: b5ebf255ba7f19543b7faea59e86ea77, type: 3}
cardLayoutTags: []
functionText: Card_Basic_DualStrike_FunctionText
cardDescription: '$Keyword("Strike"), deal $Attribute("Damage") damage twice. '
baseWeight: 1

5
Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Strike.asset
View File

@@ -17,10 +17,11 @@ MonoBehaviour:
displayName: Card_Basic_Strike_DisplayName
cardRarity: 10
cardType: 0
tags:
keywords:
- Strike
- TargetEnemies
- Physics
cardSprite: {fileID: 21300000, guid: 54336fab907a76a4095ff5607e0b86c8, type: 3}
cardLayoutTags: []
functionText: Card_Basic_Strike_FunctionText
cardDescription: Card_Basic_Strike_Description
baseWeight: 1

3
Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_HiddenBlade.asset
View File

@@ -17,8 +17,9 @@ MonoBehaviour:
displayName: Card_Basic_HiddenBlade_DisplayName
cardRarity: 0
cardType: 50
tags: []
keywords: []
cardSprite: {fileID: 21300000, guid: 8be7e5378b35956469dceadef0180595, type: 3}
cardLayoutTags: []
functionText: Card_Basic_HiddenBlade_FunctionText
cardDescription: $Keyword("Retain"), $Keyword("Exhaust"), $Keyword("Prick"), deal
$Attribute("Damage") damage.

3
Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_HolyWaterPreparation.asset
View File

@@ -44,6 +44,5 @@ MonoBehaviour:
upgradeCards: []
customDescriptions: []
prefabRefs: []
derivativeCardDataRefs:
- CardData_Basic_HolyWaterPreparation
derivativeCardDataRefs: []
derivativeCharacterDataRefs: []

1
Assets/Mods/Basic/Cards/Scripts/General/Cohesion.cs
View File

@@ -35,6 +35,7 @@ namespace Continentis.Mods.Basic.Cards
private void SelectEffect(CardInstance card)
{
card.cardLogic.ModifyAttribute("StaminaCost", -1);
card.cardLogic.contentSubmodule.keywords.Add("Retain");
card.cardLogic.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
CardTextInterpreter.InterpretText(card.cardLogic, true);
card.handCardView.Setup();

2
Assets/Mods/Basic/Cards/Scripts/General/FightingInspiration.cs
View File

@@ -34,7 +34,7 @@ namespace Continentis.Mods.Basic.Cards
private bool CardFilter(CardData cardData)
{
return cardData.cardType == CardType.Attack && cardData.HasTag("Physics");
return cardData.cardType == CardType.Attack && cardData.HasKeyword("Physics");
}
}
}

2
Assets/Mods/Basic/Cards/Scripts/General/HolyWaterPreparation.cs
View File

@@ -24,7 +24,7 @@ namespace Continentis.Mods.Basic.Cards
mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
mainGroup.AddCommand(new Cmd_Function(() =>
{
CardData holyWaterCardData = LogicComponent<CardLogicComponent_GenerateCards>().GetDerivativeCardData(0);
CardData holyWaterCardData = GetDerivativeCardData(0);
CardInstance.GenerateCardInstance(holyWaterCardData, user.team, "Hand");
}));

13
Assets/Mods/Basic/Cards/Scripts/General/Strike.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Continentis.MainGame.Card;
using Continentis.MainGame.Character;
using Continentis.MainGame.Commands;
@@ -14,18 +15,22 @@ namespace Continentis.Mods.Basic.Cards
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override CommandBase PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_PlaySFX("SFX_Basic_SwordStrike"),
new Cmd_SpawnVFX("VFX_Basic_RedImpact"),
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target))));
new Cmd_SpawnVFX("VFX_Basic_RedImpact"));
foreach (Cmd_PlayAnimation cmd in mainGroup.GetAllCommands<Cmd_PlayAnimation>())
{
cmd.AddAction<CharacterBase>(0.7f, "Target", target => user.Attack(target, GetFinalDamage(target)));
}
return mainGroup;
}
public override void ApplyAttributeChangesByCard()
{
LogicComponent<CardLogicComponent_Attack>().SetDamage_Strike();

51
Assets/Mods/Basic/Characters/CharacterViews/Animations/Attack.anim
View File

@@ -17,27 +17,6 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Body/Firearm
classID: 1
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
@@ -103,15 +82,6 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 539894089
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 2073732236
attribute: 3843704414
@@ -143,27 +113,6 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Body/Firearm
classID: 1
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2

57
Assets/Mods/Basic/Characters/CharacterViews/Animations/Idle.anim
View File

@@ -7,7 +7,7 @@ AnimationClip:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
@@ -17,26 +17,8 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Body/Firearm
classID: 1
script: {fileID: 0}
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
@@ -73,6 +55,7 @@ AnimationClip:
path: Body
classID: 114
script: {fileID: 11500000, guid: ed8b1ae4e4e52b34ea557c1c11e076fc, type: 3}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -81,13 +64,6 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 713069421
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2073732236
attribute: 1181594048
@@ -95,6 +71,8 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -117,26 +95,8 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Body/Firearm
classID: 1
script: {fileID: 0}
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
@@ -173,6 +133,7 @@ AnimationClip:
path: Body
classID: 114
script: {fileID: 11500000, guid: ed8b1ae4e4e52b34ea557c1c11e076fc, type: 3}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

51
Assets/Mods/Basic/Characters/CharacterViews/Animations/Skill.anim
View File

@@ -17,27 +17,6 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Body/Firearm
classID: 1
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
@@ -94,15 +73,6 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 539894089
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 2073732236
attribute: 1181594048
@@ -134,27 +104,6 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Body/Firearm
classID: 1
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2

4
Assets/Mods/Basic/Characters/CharacterViews/CombatViews/MarshalOfTheUnderworld.prefab
View File

@@ -455,7 +455,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 6991849013916550155, guid: 671c5c2c0a10455c9c046b8e8e5011a7, type: 3}
m_Sprite: {fileID: 4723107735738678597, guid: 671c5c2c0a10455c9c046b8e8e5011a7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -495,7 +495,7 @@ MonoBehaviour:
m_CategoryHash: 9.365925e-16
m_labelHash: 0.00000040954276
m_SpriteKey: 8.913528e-15
m_SpriteHash: 673223268
m_SpriteHash: 288431053
--- !u!1 &4492774868295366629
GameObject:
m_ObjectHideFlags: 0

2
Assets/Mods/Basic/Characters/CharacterViews/Controller.controller
View File

@@ -423,7 +423,7 @@ AnimatorStateMachine:
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 0, y: 250, z: 0}
m_EntryPosition: {x: 0, y: -140, z: 0}
m_EntryPosition: {x: -120, y: -140, z: 0}
m_ExitPosition: {x: 0, y: 290, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 6342953676309033787}

2
Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs
View File

@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Buffs
.AddParameterGetter("Target", () => target.data.displayName);//TODO: 以后增加角色的ContentSubmodule
this.iconSubmodule = new IconSubmodule(this).SetTextFunctions("Count");
this.combatRoundTimeSubmodule = new CountSubmodule(this, actionCount);
this.eventSubmodule = new EventSubmodule(this);

8
Assets/Mods/Basic/References.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3da21070bbc4b3142a117111283c301f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

93
Assets/Mods/Basic/References/Basic_EditKeywordsReference.asset Normal file
View File

@@ -0,0 +1,93 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !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: 634ae9a7ace35674aac295f34a73f088, type: 3}
m_Name: Basic_EditKeywordsReference
m_EditorClassIdentifier: GameAPI::Continentis.Mods.EditKeywordsReference
keywordRefs:
dictionaryList:
- Key: TargetSelf
Value:
index: 0
isKeyDuplicated: 0
- Key: TargetEnemies
Value:
index: 1
isKeyDuplicated: 0
- Key: TargetAllies
Value:
index: 2
isKeyDuplicated: 0
- Key: TargetAll
Value:
index: 3
isKeyDuplicated: 0
- Key: Strike
Value:
index: 4
isKeyDuplicated: 0
- Key: Prick
Value:
index: 5
isKeyDuplicated: 0
- Key: Slash
Value:
index: 6
isKeyDuplicated: 0
- Key: Arcane
Value:
index: 7
isKeyDuplicated: 0
- Key: Sorcery
Value:
index: 8
isKeyDuplicated: 0
- Key: Swiftness
Value:
index: 9
isKeyDuplicated: 0
- Key: Fortitude
Value:
index: 10
isKeyDuplicated: 0
- Key: Prediction
Value:
index: 11
isKeyDuplicated: 0
- Key: Exhaust
Value:
index: 12
isKeyDuplicated: 0
- Key: Instant
Value:
index: 13
isKeyDuplicated: 0
- Key: Unplayable
Value:
index: 14
isKeyDuplicated: 0
- Key: Innate
Value:
index: 15
isKeyDuplicated: 0
- Key: Tardy
Value:
index: 16
isKeyDuplicated: 0
- Key: Retain
Value:
index: 17
isKeyDuplicated: 0
- Key: Ethereal
Value:
index: 18
isKeyDuplicated: 0
dividerPosProp: 0.3

8
Assets/Mods/Basic/References/Basic_EditKeywordsReference.asset.meta Normal file
View File

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

15
Assets/Mods/Basic/References/Basic_ModEditReference.asset Normal file
View File

@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !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: afb8fcbb8d897e449a135120c7516dbd, type: 3}
m_Name: Basic_ModEditReference
m_EditorClassIdentifier: GameAPI::Continentis.Mods.ModEditReference
cardKeywordsReference: {fileID: 11400000, guid: af4030fdce3a4774b90f808d1a3bced8, type: 2}

8
Assets/Mods/Basic/References/Basic_ModEditReference.asset.meta Normal file
View File

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