Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
db-game-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
崔立强
db-game-template
Commits
ae0511b5
Commit
ae0511b5
authored
Apr 01, 2021
by
邱旭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉鸡的免费送到家牌子
parent
48bd1aee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
17 deletions
+21
-17
workspace.xml
.idea/workspace.xml
+14
-12
OptionPanelSkin.exml
egret/resource/skins/Objs/OptionPanelSkin.exml
+1
-1
Main.ts
egret/src/Main.ts
+1
-1
ShopPanel.ts
egret/src/Panels/ShopPanel.ts
+3
-2
WareHousePanel.ts
egret/src/Panels/WareHousePanel.ts
+2
-1
No files found.
.idea/workspace.xml
View file @
ae0511b5
...
...
@@ -48,9 +48,10 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"91d65b22-e37e-4b17-b43e-cdc81b9fe6ff"
name=
"Default Changelist"
comment=
"Default Changelist"
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/resource/skins/Objs/OptionPanelSkin.exml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/resource/skins/Objs/OptionPanelSkin.exml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Main.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Main.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/
ExchangePanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/Exchange
Panel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/
Scenes/ExchangeScene/ExchangeScene.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Scenes/ExchangeScene/ExchangeScene
.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/
ShopPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/Shop
Panel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/
Panels/WareHousePanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/WareHousePanel
.ts"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -174,8 +175,8 @@
<recent_temporary>
<list>
<item
itemvalue=
"npm.build"
/>
<item
itemvalue=
"npm.buildTS"
/>
<item
itemvalue=
"npm.dev"
/>
<item
itemvalue=
"npm.buildTS"
/>
<item
itemvalue=
"npm.buildExml"
/>
</list>
</recent_temporary>
...
...
@@ -304,14 +305,8 @@
<workItem
from=
"1616119826215"
duration=
"3221000"
/>
<workItem
from=
"1616141373483"
duration=
"666000"
/>
<workItem
from=
"1616650815558"
duration=
"236000"
/>
<workItem
from=
"1616726563592"
duration=
"2883000"
/>
</task>
<task
id=
"LOCAL-00008"
summary=
"更新"
>
<created>
1603799550747
</created>
<option
name=
"number"
value=
"00008"
/>
<option
name=
"presentableId"
value=
"LOCAL-00008"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1603799550747
</updated>
<workItem
from=
"1616726563592"
duration=
"2909000"
/>
<workItem
from=
"1617241624365"
duration=
"1050000"
/>
</task>
<task
id=
"LOCAL-00009"
summary=
"更新"
>
<created>
1603800411862
</created>
...
...
@@ -649,7 +644,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1615367020391
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"57"
/>
<task
id=
"LOCAL-00057"
summary=
"Default Changelist"
>
<created>
1616833513576
</created>
<option
name=
"number"
value=
"00057"
/>
<option
name=
"presentableId"
value=
"LOCAL-00057"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1616833513577
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"58"
/>
<servers
/>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
...
egret/resource/skins/Objs/OptionPanelSkin.exml
View file @
ae0511b5
...
...
@@ -2,7 +2,7 @@
<e:Skin
class=
"OptionPanel"
width=
"596"
height=
"400"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Image
source=
"option_panel_png"
horizontalCenter=
"0"
verticalCenter=
"0"
alpha=
"0.8"
top=
"0"
bottom=
"0"
right=
"0"
left=
"0"
/>
<e:Group
id=
"chickBtn"
x=
"23"
y=
"35"
touchChildren=
"false"
>
<e:Image
source=
"免费邮寄到家_png"
x=
"0"
y=
"0"
/>
<e:Image
source=
"免费邮寄到家_png"
x=
"0"
y=
"0"
visible=
"false"
/>
<e:Image
source=
"option_chicken_png"
x=
"92"
anchorOffsetX=
"41"
anchorOffsetY=
"56"
y=
"74"
/>
</e:Group>
<e:Image
id=
"cattleBtn"
source=
"option_cattle_png"
anchorOffsetX=
"48.5"
anchorOffsetY=
"58.5"
x=
"298"
bottom=
"235"
/>
...
...
egret/src/Main.ts
View file @
ae0511b5
...
...
@@ -24,7 +24,7 @@ export {MainStage};
class
Main
extends
eui
.
UILayer
{
protected
createChildren
():
void
{
super
.
createChildren
();
2
egret
.
lifecycle
.
addLifecycleListener
((
context
)
=>
{
// custom lifecycle plugin
});
...
...
egret/src/Panels/ShopPanel.ts
View file @
ae0511b5
...
...
@@ -195,7 +195,7 @@ export default class ShopPanel extends Panel {
* 获得道具库存价格信息
*/
private
getPropInfo
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
NetManager
.
ins
.
propInfo
((
success
,
res
)
=>
{
if
(
!
success
)
{
reject
();
...
...
@@ -260,7 +260,8 @@ class ShopItem extends Component {
private
initUi
(
data
?)
{
this
.
img
.
source
=
`prop_
${
data
.
key
}
_png`
;
// chicken wheat
this
.
tipImg
.
visible
=
(
data
.
key
==
'chicken'
||
data
.
key
==
'wheat'
);
// this.tipImg.visible = (data.key == 'chicken' || data.key == 'wheat');
this
.
tipImg
.
visible
=
(
data
.
key
==
'wheat'
);
this
.
nameTxt
.
text
=
data
.
name
;
this
.
tipTxt
.
text
=
`购买价格:
${
data
.
price
}
欢趣豆`
;
this
.
setNum
(
0
);
...
...
egret/src/Panels/WareHousePanel.ts
View file @
ae0511b5
...
...
@@ -405,7 +405,8 @@ class WareHouseSeed extends Component {
console
.
log
(
data
);
this
.
img
.
source
=
`prop_
${
data
.
name
}
_png`
;
this
.
nameTxt
.
text
=
data
.
nameLabel
;
this
.
tipImg
.
visible
=
(
data
.
name
==
'chicken'
||
data
.
name
==
'wheat'
);
// this.tipImg.visible = (data.name == 'chicken' || data.name == 'wheat');
this
.
tipImg
.
visible
=
(
data
.
name
==
'wheat'
);
this
.
updateUI
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment