InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[client] replace and macros in templates

Browse Source
This commit is contained in:
shmyga
2019-07-09 12:04:17 +03:00
parent b7bc1d244f
commit 24f5b0c218
20 changed files with 115 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/haxe/ru/m/display/DisplayObjectContainerExtender.hx
View File

@@ -5,10 +5,18 @@ import flash.display.DisplayObjectContainer;
class DisplayObjectContainerExtender {
public static function childrenIterator():Iterator<DisplayObject> {
throw "Not implemented";
}
public static function removeChildSafety(self:DisplayObjectContainer, child:DisplayObject):DisplayObject {
if (self.contains(child)) {
return self.removeChild(child);
}
return null;
}
public static function containsRecursivle(child:DisplayObject):Bool {
throw "Not implemented";
}
}

8
src/client/haxe/ru/m/tankz/view/ClientView.yaml
View File

@@ -20,7 +20,7 @@ views:
- id: settings
$type: haxework.view.ButtonView
skinId: button.settings
+onPress: $code:switcher.change('settings')
+onPress: ~switcher.change('settings')
- $type: haxework.view.SpriteView
geometry.size.width: 50%
- id: username
@@ -29,15 +29,15 @@ views:
- id: login
$type: haxework.view.ButtonView
skinId: button.login
+onPress: $code:login()
+onPress: ~login()
- id: logout
$type: haxework.view.ButtonView
skinId: button.logout
+onPress: $code:logout()
+onPress: ~logout()
visible: false
- $type: haxework.view.SpriteView
geometry.size.width: 50%
- id: close
$type: haxework.view.ButtonView
skinId: button.close
+onPress: $code:close()
+onPress: ~close()

4
src/client/haxe/ru/m/tankz/view/LevelFrame.yaml
View File

@@ -18,6 +18,6 @@ views:
$type: haxework.view.layout.TailLayout
rowSize: 10
margin: 5
factory: $this:levelViewFactory
+onItemSelect: $this:onLevelSelect
factory: ~levelViewFactory
+onItemSelect: ~onLevelSelect
geometry.padding: 10

2
src/client/haxe/ru/m/tankz/view/RecordFrame.yaml
View File

@@ -9,7 +9,7 @@ views:
text: Records
- id: data
$type: haxework.view.list.VListView
factory: $code:function() return new ru.m.tankz.view.common.RecordView()
factory: ~function() return new ru.m.tankz.view.common.RecordView()
geometry.margin.top: 20
geometry.size.stretch: true
scroll:

8
src/client/haxe/ru/m/tankz/view/ResultFrame.yaml
View File

@@ -9,7 +9,7 @@ views:
align: center
- id: result
$type: haxework.view.DataView
factory: $this:playerViewFactory
factory: ~playerViewFactory
geometry.margin.top: 20
layout:
$type: haxework.view.layout.VerticalLayout
@@ -23,14 +23,14 @@ views:
$type: haxework.view.ButtonView
skinId: button.simple
text: Levels
+onPress: $code:levels()
+onPress: ~levels()
- id: restart
$type: haxework.view.ButtonView
skinId: button.simple
text: Restart
+onPress: $code:restart()
+onPress: ~restart()
- id: next
$type: haxework.view.ButtonView
skinId: button.simple
text: Next
+onPress: $code:next()
+onPress: ~next()

10
src/client/haxe/ru/m/tankz/view/StartFrame.yaml
View File

@@ -11,24 +11,24 @@ views:
geometry.margin.bottom: 30
- $type: haxework.view.ButtonView
skinId: button
+onPress: $code:startGame('classic')
+onPress: ~startGame('classic')
text: Classic
- $type: haxework.view.ButtonView
skinId: button
+onPress: $code:startGame('dota')
+onPress: ~startGame('dota')
text: DotA
- $type: haxework.view.ButtonView
skinId: button
+onPress: $code:startGame('death')
+onPress: ~startGame('death')
text: DeathMatch
- $type: haxework.view.ButtonView
skinId: button
+onPress: $code:switcher.change('record')
+onPress: ~switcher.change('record')
text: Records
- id: network
$type: haxework.view.ButtonView
skinId: button
+onPress: $code:startNetwork()
+onPress: ~startNetwork()
text: Network
#disabled: true
- $type: haxework.view.LabelView

4
src/client/haxe/ru/m/tankz/view/common/RecordView.yaml
View File

@@ -6,7 +6,7 @@ views:
- id: play
$type: haxework.view.ButtonView
skinId: button.start.small
+onPress: $code:play()
+onPress: ~play()
- id: date
$type: haxework.view.LabelView
skinId: text.box
@@ -26,4 +26,4 @@ views:
- id: delete
$type: haxework.view.ButtonView
skinId: button.close.small
+onPress: $code:delete()
+onPress: ~delete()

8
src/client/haxe/ru/m/tankz/view/common/SlotView.yaml
View File

@@ -14,3 +14,11 @@ views:
geometry.size.height: 100%
geometry.size.width: 120
text: "-"
- id: select
$type: haxework.view.SelectView<ru.m.tankz.control.Controller>
labelSkinId: text.box
data:
- ~ru.m.tankz.control.Controller.NONE
- ~ru.m.tankz.control.Controller.HUMAN(0)
- ~ru.m.tankz.control.Controller.HUMAN(1)
selected: ~ru.m.tankz.control.Controller.NONE

2
src/client/haxe/ru/m/tankz/view/game/DeathGamePanel.yaml
View File

@@ -15,4 +15,4 @@ views:
$type: haxework.view.DataView
layout:
$type: haxework.view.layout.VerticalLayout
factory: $code:ru.m.tankz.view.common.LifeView.factory
factory: ~ru.m.tankz.view.common.LifeView.factory

6
src/client/haxe/ru/m/tankz/view/network/RoomFrame.yaml
View File

@@ -24,13 +24,13 @@ views:
$type: haxework.view.ButtonView
skinId: button.simple
text: Start
+onPress: $code:network.startGame()
+onPress: ~network.startGame()
visible: false
- id: leave
$type: haxework.view.ButtonView
skinId: button.simple
text: Leave
+onPress: $code:network.leaveGame()
+onPress: ~network.leaveGame()
- $type: haxework.view.SpriteView
geometry.size.width: 100%
geometry.size.height: 3
@@ -38,4 +38,4 @@ views:
- id: slots
$type: haxework.view.list.VListView
geometry.size.stretch: true
factory: $code:ru.m.tankz.view.network.SlotItemView.factory
factory: ~ru.m.tankz.view.network.SlotItemView.factory

2
src/client/haxe/ru/m/tankz/view/network/RoomItemView.yaml
View File

@@ -24,4 +24,4 @@ views:
geometry.size.height: 100%
skinId: button.simple
text: Join
+onPress: $code:join()
+onPress: ~join()

4
src/client/haxe/ru/m/tankz/view/network/RoomListFrame.yaml
View File

@@ -15,9 +15,9 @@ views:
- $type: haxework.view.ButtonView
skinId: button.simple
text: Create
+onPress: $code:create()
+onPress: ~create()
- id: games
$type: haxework.view.list.VListView
geometry.size.stretch: true
factory: $code:ru.m.tankz.view.network.RoomItemView.factory
factory: ~ru.m.tankz.view.network.RoomItemView.factory
geometry.margin: 10

2
src/client/haxe/ru/m/tankz/view/network/SlotItemView.yaml
View File

@@ -22,4 +22,4 @@ views:
$type: haxework.view.ButtonView
skinId: button.simple
text: Select
+onPress: $this:select()
+onPress: ~select()

12
src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml
View File

@@ -22,7 +22,7 @@ view:
text: New game
- $type: haxework.view.ButtonView
skinId: window.close
+onPress: $code:reject('close')
+onPress: ~reject('close')
- $type: haxework.view.VGroupView
geometry.size.stretch: true
geometry.padding: [5, 20]
@@ -39,8 +39,8 @@ view:
layout:
$type: haxework.view.layout.TailLayout
margin: 10
factory: $this:gameTypeViewFactory
+onItemSelect: $this:onGameTypeSelect
factory: ~gameTypeViewFactory
+onItemSelect: ~onGameTypeSelect
data:
- "classic"
- "dota"
@@ -60,8 +60,8 @@ view:
$type: haxework.view.layout.TailLayout
rowSize: 10
margin: 5
factory: $this:levelViewFactory
+onItemSelect: $this:onLevelSelect
factory: ~levelViewFactory
+onItemSelect: ~onLevelSelect
geometry.padding: 10
- $type: haxework.view.HGroupView
layout.hAlign: center
@@ -71,4 +71,4 @@ view:
- $type: haxework.view.ButtonView
skinId: button.simple
text: Create
+onPress: $code:submit()
+onPress: ~submit()

6
src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml
View File

@@ -11,8 +11,8 @@ view:
- id: fonts
$type: haxework.view.list.VListView
geometry.size.stretch: true
factory: $this:fontViewFactory
+onItemSelect: $code:function(item) close(item.data)
factory: ~fontViewFactory
+onItemSelect: ~function(item) close(item.data)
scroll:
$type: haxework.view.list.VScrollBarView
skinId: scroll.vertical
@@ -24,4 +24,4 @@ view:
- $type: haxework.view.ButtonView
skinId: button.simple
text: Cancel
+onPress: $code:reject('cancel')
+onPress: ~reject('cancel')

10
src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml
View File

@@ -22,7 +22,7 @@ view:
skinId: text
- $type: haxework.view.ButtonView
skinId: window.close
+onPress: $code:reject('close')
+onPress: ~reject('close')
- $type: haxework.view.ScrollView
geometry.size.stretch: true
layout.hAlign: center
@@ -31,16 +31,16 @@ view:
id: slots
$type: haxework.view.DataView
geometry.padding: 10
factory: $this:slotViewFactory
factory: ~slotViewFactory
layout:
$type: haxework.view.layout.VerticalLayout
# $type: haxework.view.layout.TailLayout
margin: 5
+onItemSelect: $this:onControlSelect
+onItemSelect: ~onControlSelect
- id: presets
$type: haxework.view.DataView
factory: $this:presetViewFactory
+onDataSelect: $this:onPresetSelect
factory: ~presetViewFactory
+onDataSelect: ~onPresetSelect
layout:
$type: haxework.view.layout.HorizontalLayout
hAlign: center

4
src/client/haxe/ru/m/tankz/view/popup/LoginPopup.yaml
View File

@@ -22,7 +22,7 @@ view:
text: Login
- $type: haxework.view.ButtonView
skinId: window.close
+onPress: $code:reject('close')
+onPress: ~reject('close')
- $type: haxework.view.VGroupView
geometry.size.width: 100%
# geometry.size.stretch: true
@@ -63,4 +63,4 @@ view:
- $type: haxework.view.ButtonView
skinId: button.simple
text: Submit
+onPress: $code:submit()
+onPress: ~submit()

12
src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml
View File

@@ -14,24 +14,24 @@ views:
geometry.size.width: 100%
views:
- $type: haxework.view.ButtonView
+onPress: $code:screen()
+onPress: ~screen()
skinId: button.simple
text: Screen
- $type: haxework.view.ButtonView
+onPress: $code:change()
+onPress: ~change()
skinId: button.simple
text: Change
- $type: haxework.view.ButtonView
+onPress: $code:clear()
+onPress: ~clear()
skinId: button.simple
text: Clear
- $type: haxework.view.ButtonView
+onPress: $code:default_()
+onPress: ~default_()
skinId: button.simple
text: Default
- id: list
$type: haxework.view.DataView
layout:
$type: haxework.view.layout.VerticalLayout
factory: $this:viewFactory
+onItemSelect: $this:onItemSelect
factory: ~viewFactory
+onItemSelect: ~onItemSelect