diff --git a/SoloKing/Asset/Levels/Map_NewYear.umap b/SoloKing/Asset/Levels/Map_NewYear.umap index c1f630a6..f0fa5af3 100644 Binary files a/SoloKing/Asset/Levels/Map_NewYear.umap and b/SoloKing/Asset/Levels/Map_NewYear.umap differ diff --git a/SoloKing/Script/Global/EventTypes.lua b/SoloKing/Script/Global/EventTypes.lua index 3ee1accc..bbf3172e 100644 --- a/SoloKing/Script/Global/EventTypes.lua +++ b/SoloKing/Script/Global/EventTypes.lua @@ -42,4 +42,5 @@ EventTypes = EventTypes or { UpdateWeapons = CountTable(); -- 所有存档数据准备就绪 OpenOldWeaponParts = CountTable(); -- 所有存档数据准备就绪 + UpdateDamageText = CountTable(), -- 客户端 } diff --git a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua index 4451041b..58b211e6 100644 --- a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua +++ b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua @@ -2115,4 +2115,10 @@ function Mini_Solo:ShowRankInheritanceUI() end end +function Mini_Solo:OpenOldParts(PlayerKey, bOldParts) + if ArchiveTable[PlayerKey] then + ArchiveTable[PlayerKey].bOldParts = bOldParts; + end +end + return Mini_Solo; diff --git a/SoloKing/Script/Global/Tool/UETool.lua b/SoloKing/Script/Global/Tool/UETool.lua index a8ae5ac7..a7c9ffe0 100644 --- a/SoloKing/Script/Global/Tool/UETool.lua +++ b/SoloKing/Script/Global/Tool/UETool.lua @@ -142,7 +142,7 @@ function UE.InitArchiveData() EnterWeaponIndex = nil; -- 娱乐模式的之前选择的 Index EnterWeapons = {}; -- 娱乐模式保存的武器 - bOldParts = nil, -- 是否默认开启之前的武器配件配置 + bOldParts = false, -- 是否默认开启之前的武器配件配置 }; end diff --git a/SoloKing/Script/UI/Tool/WB_DamageTextButton.lua b/SoloKing/Script/UI/Tool/WB_DamageTextButton.lua index 88e860a6..b16d2882 100644 --- a/SoloKing/Script/UI/Tool/WB_DamageTextButton.lua +++ b/SoloKing/Script/UI/Tool/WB_DamageTextButton.lua @@ -16,23 +16,24 @@ function WB_DamageTextButton:LuaInit() UITool.BindButtonClicked(self.NewButton_Shovel, self.OnClickButton, self) UGCEventSystem.AddListener(EventTypes.UpdateEnableDamageText, self.OnUpdateDamageText, self) + UGCEventSystem.AddListener(EventTypes.UpdateDamageText, self.OnUpdateDamageText, self) self:OnUpdateDamageText(LocalPlayerController.EnableDamageText); end function WB_DamageTextButton:OnUpdateDamageText(IsEnable) self.EnableDamageText = IsEnable; - self:SetEnableDamageText(self.EnableDamageText); + self.WidgetSwitcher_ChangeShovel:SetActiveWidgetIndex(IsEnable and 1 or 0); end WB_DamageTextButton.EnableDamageText = true; function WB_DamageTextButton:OnClickButton() - self.EnableDamageText = not self.EnableDamageText; + self:OnUpdateDamageText(not self.EnableDamageText); self:SetEnableDamageText(self.EnableDamageText); + UGCEventSystem.SendEvent(EventTypes.UpdateDamageText, self.EnableDamageText); end function WB_DamageTextButton:SetEnableDamageText(IsEnable) - self.WidgetSwitcher_ChangeShovel:SetActiveWidgetIndex(IsEnable and 1 or 0); -- 发送 RPC LocalPlayerController:SetEnableDamageText(IsEnable); end @@ -45,4 +46,4 @@ end -- end -return WB_DamageTextButton \ No newline at end of file +return WB_DamageTextButton; \ No newline at end of file diff --git a/SoloKing/Script/UI/Tool/WB_OpenOldWeaponParts.lua b/SoloKing/Script/UI/Tool/WB_OpenOldWeaponParts.lua index 66c8547c..64a67a60 100644 --- a/SoloKing/Script/UI/Tool/WB_OpenOldWeaponParts.lua +++ b/SoloKing/Script/UI/Tool/WB_OpenOldWeaponParts.lua @@ -16,12 +16,14 @@ function WB_OpenOldWeaponParts:LuaInit() UITool.BindButtonClicked(self.NewButton_Shovel, self.OnClickButton, self) UGCEventSystem.AddListener(EventTypes.OpenOldWeaponParts, self.OnOpenOldWeaponParts, self) + UGCLogSystem.LogTree(string.format("[WB_OpenOldWeaponParts:LuaInit] ArchiveTable[LocalPlayerKey] ="), ArchiveTable[LocalPlayerKey]) if ArchiveTable[LocalPlayerKey] and ArchiveTable[LocalPlayerKey].bOldParts then self:OnOpenOldWeaponParts(ArchiveTable[LocalPlayerKey].bOldParts); end end function WB_OpenOldWeaponParts:OnOpenOldWeaponParts(IsEnable) + UGCLogSystem.Log("[WB_OpenOldWeaponParts:OnOpenOldWeaponParts] IsEnable = %s", tostring(IsEnable)); self.bOldParts = IsEnable; self.WidgetSwitcher_ChangeShovel:SetActiveWidgetIndex(IsEnable and 1 or 0); end @@ -32,6 +34,9 @@ function WB_OpenOldWeaponParts:OnClickButton() UGCLogSystem.Log("[WB_DamageTextButton:OnClickButton] 点击") self:OnOpenOldWeaponParts(not self.bOldParts); UGCEventSystem.SendEvent(EventTypes.OpenOldWeaponParts, self.bOldParts); + + -- 发送 RPC 进行保存 + GameState:SendMiniGameRPC("OpenOldParts", LocalPlayerKey, self.bOldParts); end -return WB_OpenOldWeaponParts \ No newline at end of file +return WB_OpenOldWeaponParts; \ No newline at end of file diff --git a/SoloKing/Script/UI/WB_Main.lua b/SoloKing/Script/UI/WB_Main.lua index 0f9cef0f..2edb7b19 100644 --- a/SoloKing/Script/UI/WB_Main.lua +++ b/SoloKing/Script/UI/WB_Main.lua @@ -113,7 +113,7 @@ function WB_Main:LuaInit() else self.CanvasPanel_Test:SetVisibility(ESlateVisibility.Collapsed); end - + self:UpdateArchiveData(); GameState:UIAlready(); end @@ -127,9 +127,9 @@ function WB_Main:OpenOldWeaponParts(IsShow) end function WB_Main:UpdateArchiveData() - if ArchiveTable[LocalPlayerKey] then return; end + if ArchiveTable[LocalPlayerKey] == nil then return; end --- 默认选项 - self:OpenOldWeaponParts(ArchiveTable[LocalPlayerKey].bOldParts or false); + self:OpenOldWeaponParts(ArchiveTable[LocalPlayerKey].bOldParts); end function WB_Main:OnShowPanel(...) diff --git a/SoloKing/Script/gamemode/Action_PlayerLogin.lua b/SoloKing/Script/gamemode/Action_PlayerLogin.lua index 75d65a6e..250686ee 100644 --- a/SoloKing/Script/gamemode/Action_PlayerLogin.lua +++ b/SoloKing/Script/gamemode/Action_PlayerLogin.lua @@ -189,9 +189,9 @@ function Action_PlayerLogin:Execute(...) UGCLogSystem.Log("[Action_PlayerLogin:Execute] 结束执行"); - if MiniManager and MiniManager.CurrMiniMode then - MiniManager.CurrMiniMode:AddPlayer(self.PlayerKey); - end + --if MiniManager and MiniManager.CurrMiniMode then + -- MiniManager.CurrMiniMode:AddPlayer(self.PlayerKey); + --end return true; end diff --git a/SoloKing/SoloKing.ugcproj b/SoloKing/SoloKing.ugcproj index 1500421b..2aee0fab 100644 --- a/SoloKing/SoloKing.ugcproj +++ b/SoloKing/SoloKing.ugcproj @@ -53,13 +53,13 @@ SwitchesInMaps=((Key="r.Mobile.EnableIBL",Value=0),(Key="s.StreamableDelegateLim PlayBindingArray=[] [JobOption] -LastJobId=600044806 -LastWindowsJobId=600026723 -LastAndroidJobId=600026723 -LastIOSJobId=600026723 -PakOnly=1 -LastSkipBake=True -LastTargetPlatform=LinuxServer+WindowsNoEditor+Android_ETC2+IOS+OpenHarmony_ETC2 +LastJobId=-1 +LastWindowsJobId=-1 +LastAndroidJobId=-1 +LastIOSJobId=-1 +PakOnly=0 +LastSkipBake=False +LastTargetPlatform=LinuxServer [UGCUploadOption] PlatformIndex=0 diff --git a/SoloKing/UGCmap.umap b/SoloKing/UGCmap.umap index ee1636ab..74f9e5e9 100644 Binary files a/SoloKing/UGCmap.umap and b/SoloKing/UGCmap.umap differ