Updated to OTCv8 3.1 rev 130

This commit is contained in:
OTCv8
2022-02-15 20:58:27 +00:00
parent 26afd88156
commit 5a3e429d32
135 changed files with 5381 additions and 2684 deletions

View File

@@ -3,8 +3,11 @@ gameMapPanel = nil
gameRightPanels = nil
gameLeftPanels = nil
gameBottomPanel = nil
gameActionPanel = nil
gameBottomActionPanel = nil
gameLeftActionPanel = nil
gameRightActionPanel = nil
gameLeftActions = nil
gameTopBar = nil
logoutButton = nil
mouseGrabberWidget = nil
countWindow = nil
@@ -47,7 +50,10 @@ function init()
gameRightPanels = gameRootPanel:getChildById('gameRightPanels')
gameLeftPanels = gameRootPanel:getChildById('gameLeftPanels')
gameBottomPanel = gameRootPanel:getChildById('gameBottomPanel')
gameActionPanel = gameRootPanel:getChildById('gameActionPanel')
gameBottomActionPanel = gameRootPanel:getChildById('gameBottomActionPanel')
gameRightActionPanel = gameRootPanel:getChildById('gameRightActionPanel')
gameLeftActionPanel = gameRootPanel:getChildById('gameLeftActionPanel')
gameTopBar = gameRootPanel:getChildById('gameTopBar')
gameLeftActions = gameRootPanel:getChildById('gameLeftActions')
connect(gameLeftPanel, { onVisibilityChange = onLeftPanelVisibilityChange })
@@ -877,8 +883,20 @@ function getBottomPanel()
return gameBottomPanel
end
function getActionPanel()
return gameActionPanel
function getBottomActionPanel()
return gameBottomActionPanel
end
function getLeftActionPanel()
return gameLeftActionPanel
end
function getRightActionPanel()
return gameRightActionPanel
end
function getTopBar()
return gameTopBar
end
function refreshViewMode()
@@ -945,9 +963,10 @@ function refreshViewMode()
if classic then
g_game.changeMapAwareRange(19, 15)
gameMapPanel:addAnchor(AnchorLeft, 'gameLeftPanels', AnchorRight)
gameMapPanel:addAnchor(AnchorRight, 'gameRightPanels', AnchorLeft)
gameMapPanel:addAnchor(AnchorBottom, 'gameActionPanel', AnchorTop)
gameMapPanel:addAnchor(AnchorLeft, 'gameLeftActionPanel', AnchorRight)
gameMapPanel:addAnchor(AnchorRight, 'gameRightActionPanel', AnchorLeft)
gameMapPanel:addAnchor(AnchorBottom, 'gameBottomActionPanel', AnchorTop)
gameMapPanel:addAnchor(AnchorTop, 'gameTopBar', AnchorBottom)
gameMapPanel:setKeepAspectRatio(true)
gameMapPanel:setLimitVisibleRange(false)
gameMapPanel:setZoom(11)

View File

@@ -96,6 +96,22 @@ UIWidget
type: horizontalBox
fit-children: true
spacing: -1
Panel
id: gameLeftActionPanel
phantom: true
focusable: false
anchors.top: gameTopBar.bottom
anchors.left: gameLeftPanels.right
anchors.bottom: bottomSplitter.top
margin-top: 3
$mobile:
visible: false
layout:
type: horizontalBox
fit-children: true
Panel
id: gameRightPanels
@@ -107,6 +123,22 @@ UIWidget
type: horizontalBox
fit-children: true
spacing: -1
Panel
id: gameRightActionPanel
phantom: true
focusable: false
anchors.top: gameTopBar.bottom
anchors.right: gameRightPanels.left
anchors.bottom: bottomSplitter.top
margin-top: 3
$mobile:
visible: false
layout:
type: horizontalBox
fit-children: true
Splitter
id: bottomSplitter
@@ -123,7 +155,7 @@ UIWidget
visible: false
Panel
id: gameActionPanel
id: gameBottomActionPanel
phantom: true
focusable: false
@@ -145,9 +177,9 @@ UIWidget
Panel
id: gameBottomPanel
$!mobile:
anchors.left: gameActionPanel.left
anchors.right: gameActionPanel.right
anchors.top: gameActionPanel.bottom
anchors.left: gameBottomActionPanel.left
anchors.right: gameBottomActionPanel.right
anchors.top: gameBottomActionPanel.bottom
anchors.bottom: parent.bottom
$mobile:
@@ -159,3 +191,18 @@ UIWidget
id: mouseGrabber
focusable: false
visible: false
Panel
id: gameTopBar
image-source: /images/ui/panel_bottom2
anchors.top: parent.top
anchors.left: gameBottomActionPanel.left
anchors.right: gameBottomActionPanel.right
focusable: false
$mobile:
height: 0
layout:
type: verticalBox
fit-children: true

View File

@@ -35,6 +35,7 @@ Module
- game_shop
- game_itemselector
- client_textedit
- client_profiles
- game_actionbar
- game_prey
- game_imbuing