diff --git a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs index 417feee..8731920 100644 --- a/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoCard/BingoCardUI.cs @@ -166,7 +166,7 @@ namespace BingoBrain GameHelper.GetVideo("reward_extraFlip", isSuccess => { - if (isSuccess) + if (isSuccess) { var adwardModel = GameHelper.GetConfig(); MaxClickNum = Mathf.Clamp(MaxClickNum + adwardModel.GetData("reward_extraFlip").rewardAmount, @@ -326,9 +326,7 @@ namespace BingoBrain var tw1 = DOVirtual.DelayedCall(0.3f, () => { canClick = true; }); tweenerQueue.Enqueue(tw1); }); - rewardData.condition = GameHelper.IsCanGuide() ? RewardCondition.None : RewardCondition.AD; - rewardData.displayType = - RewardDisplayType.Dialog | RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; + rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData); } else diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index c83b664..70a5a48 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -135,6 +135,7 @@ namespace BingoBrain ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex; ui.type.selectedIndex = model.CardBoardCountIndex; ui.btn_ballon.visible = !IsBallonCD; + (ui.btn_ballon as btn_balloon).cash_text.text = $" {GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102):N}"; ui.btn_ballon.SetClick(OnClickBalloon); ui.btn_ballon.sortingOrder = 100; @@ -286,6 +287,7 @@ namespace BingoBrain if (ui.btn_ballon.visible) { MoveToOtherSide(); + (ui.btn_ballon as btn_balloon).cash_text.text = $" {GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102):N}"; } } } diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 23f4d69..8bc1bf0 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -74,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 128 + controlID: 115 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -152,7 +152,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 127 + controlID: 37 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -276,7 +276,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 62 + controlID: 38 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -350,7 +350,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Plugins/iOS + - Assets/BingoBrain/ModuleUI/NetLoading m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -358,16 +358,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Plugins/iOS + - Assets/BingoBrain/ModuleUI/NetLoading m_LastFoldersGridSize: 16 m_LastProjectPath: D:\git_test\BingoGrassland m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 1200} - m_SelectedIDs: f4990100 - m_LastClickedID: 104948 - m_ExpandedIDs: 00000000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e00001a6e00001c6e00001e6e0000226e0000246e0000266e0000286e00002a6e0000306e0000566e0000606e0000626e00006a6e00006c6e00006e6e0000c26e000000ca9a3bffffff7f + scrollPos: {x: 0, y: 7} + m_SelectedIDs: fe6e0000 + m_LastClickedID: 28414 + m_ExpandedIDs: 00000000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -395,7 +395,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e00001a6e00001c6e00001e6e0000206e0000226e0000246e0000266e0000286e00002a6e00002c6e00002e6e0000306e0000 + m_ExpandedIDs: 00000000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -537,21 +537,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ce14edff4e4bedffd24bedff0492edff1692edff3a92edff5292edff6892edffe092edff10c3edff46c3edff5ec3edff74c3edffecc3edff7e46efff2447efff2a02f2ff3002f2ff340df2ff1015f2ff4615f2ff5e15f2ff7415f2ffec15f2ffd8a3f3ffdea3f3ffe4a3f3ff2cabf3ff50abf3ff68abf3ff7eabf3fff6abf3ff04b0f4ff46b0f4ff5eb0f4ff74b0f4ff8cb0f4ffecb0f4ff42cdf4ff14e2f4ff56e2f4ff6ee2f4ff84e2f4fffce2f4ff2e4cf5ff524ff5ff584ff5ff5e4ff5ff0e5af5ff065cf5ff9063f5ffa863f5ffbe63f5ff3664f5ff2498f5ff6698f5ff7e98f5ff9498f5ff0c99f5ff66b0f5ff6cb0f5ff7eb0f5ffbeb9f5ffdcb9f5ff00baf5ff18baf5ff2ebaf5ffa6baf5ff3ef2f5ff80f2f5ff98f2f5ffaef2f5ff26f3f5ffbc10f6ffc210f6ff3a12f6ff4012f6ff5a12f6ff6412f6ff7c12f6ff9212f6ff0a13f6fff258f6ff3459f6ff4c59f6ff6259f6ffda59f6ff9e78f6ffe078f6fff878f6ff0e79f6ff8679f6ffa640f8ff0845f8ff084df8ff0e4df8ff90cef8ff96cef8ffdecef8ff20cff8ff40d6f8ffa0daf8ff00e2f8ffa0e2f8ffa6e2f8ff644df9ff3c94f9ff5494f9ff6a94f9ffbe94f9ffc294f9ffd294f9ffe294f9ffe49cf9ffe89cf9fff89cf9ff089df9ffaea0f9ffb2a0f9ffc2a0f9ffd2a0f9ff6ca4f9ff70a4f9ff80a4f9ff90a4f9ff7c85faff8285faff748bfaff7a8bfafff88cfaff128dfaff1c8dfaff348dfaff4a8dfaffc28dfafffa82fcff6a8cfcff708cfcff948cfcffac8cfcffc28cfcff3a8dfcffb6b7fcff5cb8fcffe40afdff940cfdffac0cfdffc20cfdff3a0dfdffbe51fdffce51fdff0c5bfdff1c5bfdff9a65fdffaa65fdff6ab0fdff7ab0fdff8ab0fdfff4c4feff04c5feff3c35ffff4c35ffff4a58ffff5a58ffff108effff208effff2afbfffff4ffffff + m_ExpandedIDs: 78cbfeff0cf0feff18f0feff1ef0feff42f0feff5af0feff70f0feffe8f0feff101fffffd87fffff169afffff2a4ffff28a5ffff40a5ffff56a5ffffcea5ffffeefafffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: (GodPleAcUI)Com_CoinWnd - m_OriginalName: (GodPleAcUI)Com_CoinWnd + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -700560 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 7} m_SearchString: @@ -904,9 +904,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 10003.788, y: 9991.058, z: 0.19638933} + m_Target: {x: 10002.497, y: 9993.789, z: 0.22563137} speed: 2 - m_Value: {x: 10003.788, y: 9991.058, z: 0.19638933} + m_Value: {x: 10002.497, y: 9993.789, z: 0.22563137} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -956,9 +956,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.467294 + m_Target: 4.543086 speed: 2 - m_Value: 7.467294 + m_Value: 4.543086 m_Ortho: m_Target: 1 speed: 2 @@ -1050,7 +1050,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1