fix:1、修复bug。2、删除json表,改为配置加载

This commit is contained in:
barry
2026-06-30 22:15:06 +08:00
parent 1354dfbc34
commit 776d63928d
1086 changed files with 49845 additions and 533285 deletions
@@ -99,7 +99,7 @@ namespace ChillConnect
private Vector2 _lastTouchPos;
private bool _isDraging;
// 拖拽边界留边(防止完全移出屏幕)
private readonly float _dragBorder = 100f;
private readonly float _dragBorder = -300f;
#endregion
@@ -350,10 +350,12 @@ namespace ChillConnect
{
if (Screen.safeArea.y != 0)
{//刘海屏
ui.panel.y += Screen.safeArea.y - 15;
ui.panel.y += Screen.safeArea.y - 25;
ui.com_money.y += Screen.safeArea.y- 15;
ui.com_gem.y += Screen.safeArea.y - 15;
ui.btn_signin.y += Screen.safeArea.y - 15;
ui.btn_signin.y += Screen.safeArea.y - 25;
ui.com_gift.y += Screen.safeArea.y - 15;
ui.btn_wv.y += Screen.safeArea.y - 25;
}
ui.state.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
@@ -385,6 +387,8 @@ namespace ChillConnect
}
GameHelper.IsShowFirstReward();
GameHelper.IsShowPettyReward();
GameHelper.ShowStatementView();
}
@@ -554,6 +558,12 @@ namespace ChillConnect
_fingerTipObj.visible = false;
_fingerTipObj.touchable = false;
_fingerTipObj.sortingOrder = 9999;
if (GameHelper.IsShowOpenGameUI() && HallManager.Instance.openTipsTimes >= 1)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open);
}
}
@@ -603,6 +613,7 @@ namespace ChillConnect
var vo = ConfigSystem.GetConfig<MakeupModel>().GetData(makeupTaskData.tableId);
if (vo == null)
{
Debug.LogError("MakeupTaskData 为空");
return;
}
GameHelper.showGameUI = false;
@@ -628,7 +639,15 @@ namespace ChillConnect
{
ui.btn_wv.visible = false;
}
ui.btn_wv.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.H5UI_Open); });
ui.btn_wv.SetClick(() =>
{
SDKOpenConfig openConfig = new SDKOpenConfig
{
normal = true,
url = ""
};
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
});
ui.com_bottom.btn_skin.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.ArrowThemeUI_Open); });
@@ -1204,6 +1223,7 @@ namespace ChillConnect
unit.GetChild("line").asGraph.color = lineColor;
unit.visible = true;
unit.touchable = true;
unit.name = "Arrow_" + arrow.id;
unit.onClick.Add(() => OnPathClick(arrow));
_viewContainer.AddChild(unit);
@@ -1252,6 +1272,7 @@ namespace ChillConnect
else if (type == 1)
{
_isDeleteMode = !_isDeleteMode;
GameHelper.ShowTips("You can delete any one of the arrows!");
}
}
@@ -1709,6 +1730,7 @@ namespace ChillConnect
if (icon != null) icon.color = arrowColor;
arrowIns.visible = true;
arrowIns.name = "Arrow_" + arrow.id;
arrowIns.onClick.Add(() => OnPathClick(arrow));
_viewContainer.AddChild(arrowIns);