diff --git a/Content/Widget/EFCard/T_Text.uasset b/Content/Widget/EFCard/T_Text.uasset new file mode 100644 index 000000000..c28222031 Binary files /dev/null and b/Content/Widget/EFCard/T_Text.uasset differ diff --git a/Content/Widget/EFCard/WB_EFcard.uasset b/Content/Widget/EFCard/WB_EFcard.uasset index 371dde706..a2049df60 100644 Binary files a/Content/Widget/EFCard/WB_EFcard.uasset and b/Content/Widget/EFCard/WB_EFcard.uasset differ diff --git a/Content/Widget/EFCard/イーフカード.uasset b/Content/Widget/EFCard/イーフカード.uasset new file mode 100644 index 000000000..0247a8c6e Binary files /dev/null and b/Content/Widget/EFCard/イーフカード.uasset differ diff --git a/Source/TG_ARPG/Private/OSBlueprintFunctionLibrary.cpp b/Source/TG_ARPG/Private/OSBlueprintFunctionLibrary.cpp index 6fcf691c5..13d4bfb08 100644 --- a/Source/TG_ARPG/Private/OSBlueprintFunctionLibrary.cpp +++ b/Source/TG_ARPG/Private/OSBlueprintFunctionLibrary.cpp @@ -73,6 +73,17 @@ AActor* UOSBlueprintFunctionLibrary::GetNearestActor(TArray Actors, AAc return NearestActor; } +void UOSBlueprintFunctionLibrary::CompareMap(TMap OldMap, TMap NewMap, + TMap& AddMap, TMap& SubMap, TEnumAsByte& Result) +{ +} + + + + + + + diff --git a/Source/TG_ARPG/Public/OSBlueprintFunctionLibrary.h b/Source/TG_ARPG/Public/OSBlueprintFunctionLibrary.h index 8801fb2a2..d3878d2f9 100644 --- a/Source/TG_ARPG/Public/OSBlueprintFunctionLibrary.h +++ b/Source/TG_ARPG/Public/OSBlueprintFunctionLibrary.h @@ -12,11 +12,12 @@ * */ //一个数据结构,用于储存一个数组的值用来做执行引脚 -UENUM(BlueprintType) -enum class EBlueprintExecNodePin : uint8 +UENUM(BlueprintType)//这里的UENUM是ue内部用的枚举类型,就和创建成员和函数用的UPR和UFUN一样 +enum AddorSub//正常的枚举就可以了,记住自己枚举的命名 { - False1, - True1 + Add,//我这里是创建了2个,可以创建多个 + Sub, + None }; @@ -32,6 +33,12 @@ class TG_ARPG_API UOSBlueprintFunctionLibrary : public UBlueprintFunctionLibrary // UFUNCTION(BlueprintCallable,Category="OSBlueprintFunctionLibrary") static AActor* GetNearestActor(TArray Actors, AActor* SelfActor, AActor* LastNearestActor,bool& bIsNeedUpdate); + + + //输入两个map,key为playerstate,value为任何类型,将两个map的key对比,增加的和减少的分别放入两个map,并且返回执行引脚 + UFUNCTION(BlueprintCallable, Category = "OSBlueprintFunctionLibrary", Meta = (ExpandEnumAsExecs = "Result")) + static void CompareMap(TMap OldMap, TMap NewMap, TMap& AddMap, TMap& SubMap, TEnumAsByte& Result); + };