diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 631def36e..b64b0f934 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -156,3 +156,6 @@ bInitServerOnClient=true NetConnectionClassName="OnlineSubsystemSteam.SteamNetConnection" + +[CoreRedirects] ++FunctionRedirects=(OldName="/Script/TG_ARPG.OSBlueprintFunctionLibrary.OSModeJudge",NewName="/Script/TG_ARPG.OSBlueprintFunctionLibrary.GetMap") \ No newline at end of file diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index ea39b49de..8a03540aa 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -26,3 +26,6 @@ bCanChangeGamepadType=True +ControllerData=/Game/UI/Foundation/Platform/Input/GamepadXboxOne/CommonInput_Gamepad_XboxOne.CommonInput_Gamepad_XboxOne_C +ControllerData=/Game/UI/Foundation/Platform/Input/GamepadXboxSeriesX/CommonInput_Gamepad_XSX.CommonInput_Gamepad_XSX_C +[/Script/CommonLoadingScreen.CommonLoadingScreenSettings] +ForceTickLoadingScreenEvenInEditor=False + diff --git a/Content/Blueprint/Base/TG_GameInstance.uasset b/Content/Blueprint/Base/TG_GameInstance.uasset index a0c585ce3..05a2ad4bc 100644 Binary files a/Content/Blueprint/Base/TG_GameInstance.uasset and b/Content/Blueprint/Base/TG_GameInstance.uasset differ diff --git a/Content/Blueprint/Base/TG_GameModeBase.uasset b/Content/Blueprint/Base/TG_GameModeBase.uasset index 672eb7fda..c78e55cb1 100644 Binary files a/Content/Blueprint/Base/TG_GameModeBase.uasset and b/Content/Blueprint/Base/TG_GameModeBase.uasset differ diff --git a/Content/Blueprint/Base/TG_GameStateBase.uasset b/Content/Blueprint/Base/TG_GameStateBase.uasset index 49b8c4b8a..68704ca88 100644 Binary files a/Content/Blueprint/Base/TG_GameStateBase.uasset and b/Content/Blueprint/Base/TG_GameStateBase.uasset differ diff --git a/Content/Blueprint/Base/TG_PlayerControllerBase.uasset b/Content/Blueprint/Base/TG_PlayerControllerBase.uasset index 956cebb0a..25b471b5f 100644 Binary files a/Content/Blueprint/Base/TG_PlayerControllerBase.uasset and b/Content/Blueprint/Base/TG_PlayerControllerBase.uasset differ diff --git a/Content/Blueprint/Base/TG_PlayerStateBase.uasset b/Content/Blueprint/Base/TG_PlayerStateBase.uasset index db9ad17a2..b0c36fd97 100644 Binary files a/Content/Blueprint/Base/TG_PlayerStateBase.uasset and b/Content/Blueprint/Base/TG_PlayerStateBase.uasset differ diff --git a/Content/Blueprint/Character/BP_Player1.uasset b/Content/Blueprint/Character/BP_Player1.uasset index 7b412011a..da25dadb4 100644 Binary files a/Content/Blueprint/Character/BP_Player1.uasset and b/Content/Blueprint/Character/BP_Player1.uasset differ diff --git a/Content/Blueprint/Character/BP_PlayerBase.uasset b/Content/Blueprint/Character/BP_PlayerBase.uasset index 5762f66c2..4e7b438ae 100644 Binary files a/Content/Blueprint/Character/BP_PlayerBase.uasset and b/Content/Blueprint/Character/BP_PlayerBase.uasset differ diff --git a/Content/Blueprint/Character/BP_PlayerGamePlay.uasset b/Content/Blueprint/Character/BP_PlayerGamePlay.uasset index 91f7d6ae7..b1996ab7f 100644 Binary files a/Content/Blueprint/Character/BP_PlayerGamePlay.uasset and b/Content/Blueprint/Character/BP_PlayerGamePlay.uasset differ diff --git a/Content/Blueprint/FunctionLib/F_DataLib.uasset b/Content/Blueprint/FunctionLib/F_DataLib.uasset index de2f779e3..e2a9f5f43 100644 Binary files a/Content/Blueprint/FunctionLib/F_DataLib.uasset and b/Content/Blueprint/FunctionLib/F_DataLib.uasset differ diff --git a/Content/Blueprint/FunctionLib/F_MatchState.uasset b/Content/Blueprint/FunctionLib/F_MatchState.uasset index 71191c316..56d906bea 100644 Binary files a/Content/Blueprint/FunctionLib/F_MatchState.uasset and b/Content/Blueprint/FunctionLib/F_MatchState.uasset differ diff --git a/Content/Blueprint/FunctionLib/F_SetLoadingScreen.uasset b/Content/Blueprint/FunctionLib/F_SetLoadingScreen.uasset index 4424574ce..da4f7b4f8 100644 Binary files a/Content/Blueprint/FunctionLib/F_SetLoadingScreen.uasset and b/Content/Blueprint/FunctionLib/F_SetLoadingScreen.uasset differ diff --git a/Content/Blueprint/GamePlay/TG_GameModeGamePlay.uasset b/Content/Blueprint/GamePlay/TG_GameModeGamePlay.uasset index 38c7b8724..cf4e35e0a 100644 Binary files a/Content/Blueprint/GamePlay/TG_GameModeGamePlay.uasset and b/Content/Blueprint/GamePlay/TG_GameModeGamePlay.uasset differ diff --git a/Content/Blueprint/GamePlay/TG_GameStateGamePlay.uasset b/Content/Blueprint/GamePlay/TG_GameStateGamePlay.uasset index a0df281ee..9fa5b0bb0 100644 Binary files a/Content/Blueprint/GamePlay/TG_GameStateGamePlay.uasset and b/Content/Blueprint/GamePlay/TG_GameStateGamePlay.uasset differ diff --git a/Content/Blueprint/GamePlay/TG_PlayerControllerGamePlay.uasset b/Content/Blueprint/GamePlay/TG_PlayerControllerGamePlay.uasset index 457080c8b..6c869bdd7 100644 Binary files a/Content/Blueprint/GamePlay/TG_PlayerControllerGamePlay.uasset and b/Content/Blueprint/GamePlay/TG_PlayerControllerGamePlay.uasset differ diff --git a/Content/Blueprint/Lobby/TG_GameModeLobby.uasset b/Content/Blueprint/Lobby/TG_GameModeLobby.uasset index ff4cfc6f9..9d8ee1807 100644 Binary files a/Content/Blueprint/Lobby/TG_GameModeLobby.uasset and b/Content/Blueprint/Lobby/TG_GameModeLobby.uasset differ diff --git a/Content/Blueprint/Lobby/TG_GameStateLobby.uasset b/Content/Blueprint/Lobby/TG_GameStateLobby.uasset index d92030aa8..1b1148c7d 100644 Binary files a/Content/Blueprint/Lobby/TG_GameStateLobby.uasset and b/Content/Blueprint/Lobby/TG_GameStateLobby.uasset differ diff --git a/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset b/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset index 8d52aacbe..b181fc5be 100644 Binary files a/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset and b/Content/Blueprint/Lobby/TG_PlayerControllerLobby.uasset differ diff --git a/Content/Blueprint/Lobby/TG_PlayerStateLobby.uasset b/Content/Blueprint/Lobby/TG_PlayerStateLobby.uasset index 4741b7106..30f15ff3b 100644 Binary files a/Content/Blueprint/Lobby/TG_PlayerStateLobby.uasset and b/Content/Blueprint/Lobby/TG_PlayerStateLobby.uasset differ diff --git a/Content/Blueprint/MainMenu/TG_PlayerControllerMainMenu.uasset b/Content/Blueprint/MainMenu/TG_PlayerControllerMainMenu.uasset index c4974e2d7..1c0ed67f7 100644 Binary files a/Content/Blueprint/MainMenu/TG_PlayerControllerMainMenu.uasset and b/Content/Blueprint/MainMenu/TG_PlayerControllerMainMenu.uasset differ diff --git a/Content/Maps/Login.umap b/Content/Maps/Login.umap index bdfffe4be..ebe18e232 100644 Binary files a/Content/Maps/Login.umap and b/Content/Maps/Login.umap differ diff --git a/Content/Tengen/Data/S_CharacterData.uasset b/Content/Tengen/Data/S_CharacterData.uasset index ad2a79324..4955db63a 100644 Binary files a/Content/Tengen/Data/S_CharacterData.uasset and b/Content/Tengen/Data/S_CharacterData.uasset differ diff --git a/Content/Tengen/Input/IA_UI_PauseMenu.uasset b/Content/Tengen/Input/IA_UI_PauseMenu.uasset new file mode 100644 index 000000000..e2116b7ee Binary files /dev/null and b/Content/Tengen/Input/IA_UI_PauseMenu.uasset differ diff --git a/Content/Tengen/UI/UI_GP_PlayerLIst.uasset b/Content/Tengen/UI/UI_GP_PlayerLIst.uasset index 0a17873af..a1cb5ea20 100644 Binary files a/Content/Tengen/UI/UI_GP_PlayerLIst.uasset and b/Content/Tengen/UI/UI_GP_PlayerLIst.uasset differ diff --git a/Content/UI/Common/UItest.umap b/Content/UI/Common/UItest.umap index 92bbb737c..e55f5af3b 100644 Binary files a/Content/UI/Common/UItest.umap and b/Content/UI/Common/UItest.umap differ diff --git a/Content/UI/Input/IMC_UI_GenericActions.uasset b/Content/UI/Input/IMC_UI_GenericActions.uasset index 8bffd025e..42d20f13e 100644 Binary files a/Content/UI/Input/IMC_UI_GenericActions.uasset and b/Content/UI/Input/IMC_UI_GenericActions.uasset differ diff --git a/Content/UI/Login/WB_Login.uasset b/Content/UI/Login/WB_Login.uasset index eae989227..92ed7c2dc 100644 Binary files a/Content/UI/Login/WB_Login.uasset and b/Content/UI/Login/WB_Login.uasset differ diff --git a/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset b/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset index 37d39a832..5b9191775 100644 Binary files a/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset and b/Content/Widget/Comm/CW_BaseHUD_Lobby.uasset differ diff --git a/Content/Widget/Comm/button/W_CommButtonBase.uasset b/Content/Widget/Comm/button/W_CommButtonBase.uasset new file mode 100644 index 000000000..5959b201c Binary files /dev/null and b/Content/Widget/Comm/button/W_CommButtonBase.uasset differ diff --git a/Content/Widget/EFCard/Card.uasset b/Content/Widget/EFCard/Card.uasset new file mode 100644 index 000000000..a7b20881d Binary files /dev/null and b/Content/Widget/EFCard/Card.uasset differ diff --git a/Content/Widget/EFCard/EFCard.uasset b/Content/Widget/EFCard/EFCard.uasset new file mode 100644 index 000000000..d6f795510 Binary files /dev/null and b/Content/Widget/EFCard/EFCard.uasset differ diff --git a/Content/Widget/EFCard/T_Card_1.uasset b/Content/Widget/EFCard/T_Card_1.uasset new file mode 100644 index 000000000..db88db315 Binary files /dev/null and b/Content/Widget/EFCard/T_Card_1.uasset differ diff --git a/Content/Widget/EFCard/T_Card_10.uasset b/Content/Widget/EFCard/T_Card_10.uasset new file mode 100644 index 000000000..cb147385d Binary files /dev/null and b/Content/Widget/EFCard/T_Card_10.uasset differ diff --git a/Content/Widget/EFCard/T_Card_11.uasset b/Content/Widget/EFCard/T_Card_11.uasset new file mode 100644 index 000000000..6deae9ddd Binary files /dev/null and b/Content/Widget/EFCard/T_Card_11.uasset differ diff --git a/Content/Widget/EFCard/T_Card_12.uasset b/Content/Widget/EFCard/T_Card_12.uasset new file mode 100644 index 000000000..253ee65e0 Binary files /dev/null and b/Content/Widget/EFCard/T_Card_12.uasset differ diff --git a/Content/Widget/EFCard/T_Card_2.uasset b/Content/Widget/EFCard/T_Card_2.uasset new file mode 100644 index 000000000..1807ad9fb Binary files /dev/null and b/Content/Widget/EFCard/T_Card_2.uasset differ diff --git a/Content/Widget/EFCard/T_Card_3.uasset b/Content/Widget/EFCard/T_Card_3.uasset new file mode 100644 index 000000000..e9c5029de Binary files /dev/null and b/Content/Widget/EFCard/T_Card_3.uasset differ diff --git a/Content/Widget/EFCard/T_Card_4.uasset b/Content/Widget/EFCard/T_Card_4.uasset new file mode 100644 index 000000000..0fe9c1f07 Binary files /dev/null and b/Content/Widget/EFCard/T_Card_4.uasset differ diff --git a/Content/Widget/EFCard/T_Card_5.uasset b/Content/Widget/EFCard/T_Card_5.uasset new file mode 100644 index 000000000..43d746cd2 Binary files /dev/null and b/Content/Widget/EFCard/T_Card_5.uasset differ diff --git a/Content/Widget/EFCard/T_Card_6.uasset b/Content/Widget/EFCard/T_Card_6.uasset new file mode 100644 index 000000000..33b46575e Binary files /dev/null and b/Content/Widget/EFCard/T_Card_6.uasset differ diff --git a/Content/Widget/EFCard/T_Card_7.uasset b/Content/Widget/EFCard/T_Card_7.uasset new file mode 100644 index 000000000..47dfc1d5f Binary files /dev/null and b/Content/Widget/EFCard/T_Card_7.uasset differ diff --git a/Content/Widget/EFCard/T_Card_8.uasset b/Content/Widget/EFCard/T_Card_8.uasset new file mode 100644 index 000000000..7b4aabfb1 Binary files /dev/null and b/Content/Widget/EFCard/T_Card_8.uasset differ diff --git a/Content/Widget/EFCard/T_Card_9.uasset b/Content/Widget/EFCard/T_Card_9.uasset new file mode 100644 index 000000000..b1b67186a Binary files /dev/null and b/Content/Widget/EFCard/T_Card_9.uasset differ diff --git a/Content/Widget/EFCard/Vector2.uasset b/Content/Widget/EFCard/Vector2.uasset new file mode 100644 index 000000000..4b7a317e0 Binary files /dev/null and b/Content/Widget/EFCard/Vector2.uasset differ diff --git a/Content/Widget/EFCard/Vector4.uasset b/Content/Widget/EFCard/Vector4.uasset new file mode 100644 index 000000000..bee897dc0 Binary files /dev/null and b/Content/Widget/EFCard/Vector4.uasset differ diff --git a/Content/Widget/EFCard/WB_EFcard.uasset b/Content/Widget/EFCard/WB_EFcard.uasset new file mode 100644 index 000000000..371dde706 Binary files /dev/null and b/Content/Widget/EFCard/WB_EFcard.uasset differ diff --git a/Content/Widget/EscList/W_EscList.uasset b/Content/Widget/EscList/W_EscList.uasset new file mode 100644 index 000000000..f1bf228e6 Binary files /dev/null and b/Content/Widget/EscList/W_EscList.uasset differ diff --git a/Content/Widget/Lobby/CWB_MainBar.uasset b/Content/Widget/Lobby/CWB_MainBar.uasset index a187260dd..0ba2575d0 100644 Binary files a/Content/Widget/Lobby/CWB_MainBar.uasset and b/Content/Widget/Lobby/CWB_MainBar.uasset differ diff --git a/Content/Widget/Lobby/CWB_PlayerList.uasset b/Content/Widget/Lobby/CWB_PlayerList.uasset new file mode 100644 index 000000000..79a131bc3 Binary files /dev/null and b/Content/Widget/Lobby/CWB_PlayerList.uasset differ diff --git a/Content/Widget/Lobby/WB_Main_Lobby.uasset b/Content/Widget/Lobby/WB_Main_Lobby.uasset index 4d5ac4eb3..40e844684 100644 Binary files a/Content/Widget/Lobby/WB_Main_Lobby.uasset and b/Content/Widget/Lobby/WB_Main_Lobby.uasset differ diff --git a/Content/Widget/MainMenu/WB_MainMenu.uasset b/Content/Widget/MainMenu/WB_MainMenu.uasset index b38dc1cbd..6556b7392 100644 Binary files a/Content/Widget/MainMenu/WB_MainMenu.uasset and b/Content/Widget/MainMenu/WB_MainMenu.uasset differ diff --git a/Content/Widget/NetWork/W_NetWork.uasset b/Content/Widget/NetWork/W_NetWork.uasset index 38859ca43..82f45d6c5 100644 Binary files a/Content/Widget/NetWork/W_NetWork.uasset and b/Content/Widget/NetWork/W_NetWork.uasset differ diff --git a/Content/Widget/Profile/69ed081823a46161686c279956903964.uasset b/Content/Widget/Profile/69ed081823a46161686c279956903964.uasset new file mode 100644 index 000000000..f38f954b7 Binary files /dev/null and b/Content/Widget/Profile/69ed081823a46161686c279956903964.uasset differ diff --git a/Content/Widget/Profile/Mask_group.uasset b/Content/Widget/Profile/Mask_group.uasset new file mode 100644 index 000000000..8b8c1a951 Binary files /dev/null and b/Content/Widget/Profile/Mask_group.uasset differ diff --git a/Content/Widget/Profile/ProfileDetalCommonButtonStyle.uasset b/Content/Widget/Profile/ProfileDetalCommonButtonStyle.uasset new file mode 100644 index 000000000..f8c443177 Binary files /dev/null and b/Content/Widget/Profile/ProfileDetalCommonButtonStyle.uasset differ diff --git a/Content/Widget/Profile/Rectangle_17.uasset b/Content/Widget/Profile/Rectangle_17.uasset new file mode 100644 index 000000000..d5b761ccc Binary files /dev/null and b/Content/Widget/Profile/Rectangle_17.uasset differ diff --git a/Content/Widget/Profile/Rectangle_18.uasset b/Content/Widget/Profile/Rectangle_18.uasset new file mode 100644 index 000000000..df9c9721e Binary files /dev/null and b/Content/Widget/Profile/Rectangle_18.uasset differ diff --git a/Content/Widget/Profile/Vector-1.uasset b/Content/Widget/Profile/Vector-1.uasset new file mode 100644 index 000000000..2fe3d59de Binary files /dev/null and b/Content/Widget/Profile/Vector-1.uasset differ diff --git a/Content/Widget/Profile/Vector.uasset b/Content/Widget/Profile/Vector.uasset new file mode 100644 index 000000000..241662f0e Binary files /dev/null and b/Content/Widget/Profile/Vector.uasset differ diff --git a/Content/Widget/Profile/WB_Profile.uasset b/Content/Widget/Profile/WB_Profile.uasset index a82a14606..a09645c45 100644 Binary files a/Content/Widget/Profile/WB_Profile.uasset and b/Content/Widget/Profile/WB_Profile.uasset differ diff --git a/Content/Widget/Profile/WB_ProfileClient.uasset b/Content/Widget/Profile/WB_ProfileClient.uasset new file mode 100644 index 000000000..02669e3a2 Binary files /dev/null and b/Content/Widget/Profile/WB_ProfileClient.uasset differ diff --git a/Content/Widget/Profile/W_ProfileKickButton.uasset b/Content/Widget/Profile/W_ProfileKickButton.uasset new file mode 100644 index 000000000..a367b4458 Binary files /dev/null and b/Content/Widget/Profile/W_ProfileKickButton.uasset differ diff --git a/Content/Widget/UITest/NewBlueprint.uasset b/Content/Widget/UITest/NewBlueprint.uasset index beb0f2624..49f8bfd4e 100644 Binary files a/Content/Widget/UITest/NewBlueprint.uasset and b/Content/Widget/UITest/NewBlueprint.uasset differ diff --git a/Content/Widget/UITest/NewWorld.umap b/Content/Widget/UITest/NewWorld.umap index 52313ea0e..d313e6e82 100644 Binary files a/Content/Widget/UITest/NewWorld.umap and b/Content/Widget/UITest/NewWorld.umap differ diff --git a/Content/Widget/UITest/UITest.uasset b/Content/Widget/UITest/UITest.uasset index e49c6d9f6..409f43367 100644 Binary files a/Content/Widget/UITest/UITest.uasset and b/Content/Widget/UITest/UITest.uasset differ