add Combineaction

This commit is contained in:
Tran Hai Nam
2026-04-22 16:19:29 +07:00
parent f5dba37813
commit af5e72c289
10 changed files with 143754 additions and 1 deletions
@@ -1410,6 +1410,7 @@ GameObject:
- component: {fileID: 8354143382850346745}
- component: {fileID: 4448389894352443543}
- component: {fileID: 2791476417509046288}
- component: {fileID: 5118003806955342754}
m_Layer: 0
m_Name: "\u5996\u7CBE"
m_TagString: Untagged
@@ -2426,6 +2427,19 @@ MonoBehaviour:
- {fileID: 7400000, guid: 4272f3e6213068440b4f6bcbade34750, type: 2}
- {fileID: 7400000, guid: 31417b3fc94fd0f479454dc3fcfb5607, type: 2}
- {fileID: 7400000, guid: 62d8692c72987e049b94423ec51d734a, type: 2}
--- !u!114 &5118003806955342754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5544128592671745444}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472c24b873524423f95454131fd11da6, type: 3}
m_Name:
m_EditorClassIdentifier:
combinedActionSO: {fileID: 11400000, guid: ae900b2279845c944a6379064aff6f29, type: 2}
--- !u!1 &5909446679138261478
GameObject:
m_ObjectHideFlags: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ae900b2279845c944a6379064aff6f29
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -907,6 +907,7 @@ GameObject:
- component: {fileID: 5951415567811727370}
- component: {fileID: 2933135962091378275}
- component: {fileID: 720054061806230412}
- component: {fileID: 3892901130224629286}
m_Layer: 0
m_Name: "\u7FBD\u7075\u5973"
m_TagString: Untagged
@@ -2108,6 +2109,19 @@ MonoBehaviour:
- {fileID: 7400000, guid: 7dc5fb07f4f5562499bc69b645d4ed9d, type: 2}
- {fileID: 7400000, guid: 7a81940d288270d469be4f8b5230d733, type: 2}
- {fileID: 7400000, guid: 733d485f56790364189789dddbfffcfb, type: 2}
--- !u!114 &3892901130224629286
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1769235238873837677}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472c24b873524423f95454131fd11da6, type: 3}
m_Name:
m_EditorClassIdentifier:
combinedActionSO: {fileID: 11400000, guid: 5c996ee4f0bbbba458a4557f2d3e2ae3, type: 2}
--- !u!1 &1815801885025748105
GameObject:
m_ObjectHideFlags: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5c996ee4f0bbbba458a4557f2d3e2ae3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -755,6 +755,7 @@ GameObject:
- component: {fileID: 8453557373466821518}
- component: {fileID: 2236231879345885960}
- component: {fileID: 1351688607369250648}
- component: {fileID: 6701388848577721347}
m_Layer: 0
m_Name: "\u7FBD\u8292\u7537"
m_TagString: Untagged
@@ -1873,6 +1874,19 @@ MonoBehaviour:
- {fileID: 7400000, guid: 7a1b518cc0ca31d409bddbea883fa85c, type: 2}
- {fileID: 7400000, guid: be95dd6728dc0ec4fa115f3f7f50ba60, type: 2}
- {fileID: 7400000, guid: 6f09eb60a12c79346989125f988affb5, type: 2}
--- !u!114 &6701388848577721347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4570049467700484810}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 472c24b873524423f95454131fd11da6, type: 3}
m_Name:
m_EditorClassIdentifier:
combinedActionSO: {fileID: 11400000, guid: dae367eca7e062443b66ab96aca2c742, type: 2}
--- !u!1 &4654364276745040637
GameObject:
m_ObjectHideFlags: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dae367eca7e062443b66ab96aca2c742
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -1721,7 +1721,6 @@ namespace BrewMonster
PLAYER_ACTION stand_action = m_PlayerActions[(int)PLAYER_ACTION_TYPE.ACT_FIGHTSTAND];
szAct = EC_Utility.BuildActionName(stand_action, 0);
int iTranstime = 300;
BMLogger.LogError($"[THN]: PlayAttackAction QueueNonSkillActionWithName: {szAct}");
m_pActionController.QueueNonSkillActionWithName(iAction, szAct, iTranstime, false, false, true, false);
/* QueueNonSkillActionWithName(ACT_FIGHTSTAND, szAct, 300, false, bHideFX, true);