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
94873383
Commit
94873383
authored
Dec 10, 2019
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
f5ffb312
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
34 deletions
+51
-34
workspace.xml
.idea/workspace.xml
+4
-20
index.html
egret/index.html
+28
-5
TaskPanel.ts
egret/src/Panels/TaskPanel.ts
+17
-7
taskInfo.json
mock/joyousManor/taskInfo.json
+2
-2
No files found.
.idea/workspace.xml
View file @
94873383
...
...
@@ -3,25 +3,9 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"9464afa6-0efb-46c2-9cfd-05475acd81df"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/libs/tw/manager/DataManager.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/libs/tw/manager/DataManager.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/resource/skins/TaskItemSkin.exml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/resource/skins/TaskItemSkin.exml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/resource/skins/TaskToastSkin.exml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/resource/skins/TaskToastSkin.exml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/SellPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/SellPanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/SelledPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/SelledPanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/index.html"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/index.html"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/TaskPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/TaskPanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/TaskToast.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/TaskToast.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexUI.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexUI.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/LandMgr.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/LandMgr.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/TimeProgressBar.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/Scenes/IndexScene/TimeProgressBar.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/components/Bar.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/components/Bar.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/egret/src/components/ProgressNum.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/egret/src/components/ProgressNum.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/config.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/config.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/joyousManor/getLandInfo.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/joyousManor/getLandInfo.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/joyousManor/taskInfo.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/joyousManor/taskInfo.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/projectX/getUserSpList.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/projectX/getUserSpList.json"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -97,7 +81,7 @@
<workItem
from=
"1575511989902"
duration=
"370000"
/>
<workItem
from=
"1575512375307"
duration=
"22831000"
/>
<workItem
from=
"1575602130550"
duration=
"39482000"
/>
<workItem
from=
"1575855730362"
duration=
"6
152
7000"
/>
<workItem
from=
"1575855730362"
duration=
"6
227
7000"
/>
</task>
<servers
/>
</component>
...
...
@@ -133,10 +117,10 @@
<screen
x=
"36"
y=
"23"
width=
"1644"
height=
"1027"
/>
</state>
<state
x=
"586"
y=
"160"
key=
"refactoring.ChangeSignatureDialog/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027"
timestamp=
"1575965663028"
/>
<state
x=
"523"
y=
"250"
width=
"670"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"157597
7747280
"
>
<state
x=
"523"
y=
"250"
width=
"670"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"157597
8457319
"
>
<screen
x=
"36"
y=
"23"
width=
"1644"
height=
"1027"
/>
</state>
<state
x=
"523"
y=
"250"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027"
timestamp=
"157597
7747280
"
/>
<state
x=
"523"
y=
"250"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027"
timestamp=
"157597
8457319
"
/>
<state
x=
"523"
y=
"250"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/36.23.1644.1027@36.23.1644.1027"
timestamp=
"1575960048181"
/>
</component>
</project>
\ No newline at end of file
egret/index.html
View file @
94873383
...
...
@@ -51,11 +51,34 @@
<!-- console.log('Hello world');-->
<!--</script>-->
<script
type=
"text/javascript"
src=
"https://res.wx.qq.com/open/js/jweixin-1.2.0.js"
></script>
<script>
window
[
'debug'
]
=
true
;
// 是否是debug模式 是否打印debugLog
</script>
<script>
<script
src=
"https://assets.geilicdn.com/v-components/jsbridge/1.0.1/index.min.js"
></script>
<script
src=
"https://yun.duiba.com.cn/db_games/hybrid_app2.js"
></script>
<script
type=
"text/javascript"
>
window
[
'rule'
]
=
'规则规则规则规则
\
n规则规则规则规则
\
n规则规则规则规则
\
n规则规则规则规则
\
n规则规则规则规则
\
n'
;
function
share
()
{
/******************** demo ********************
调用分享交互需要传入的参数如下
******************** demoend ******************/
//pngUrl:分享后链接显示的图片地址
var
pngUrl
=
"https://yun.duiba.com.cn/db_games/fishlogo.png"
;
//shareUrl:分享后点击链接需要跳转的地址
var
shareUrl
=
"http://activity.m.duiba.com.cn/customShare/share?id=3562"
;
//title:分享后链接显示的标题
var
title
=
"特约商户支付专用01(修改)1111111111111111111111111"
;
//content:分享后链接显示的内容
var
content
=
"4星级 4167256元/人 回龙观 汽车销售4S店/ 洗浴/ 自助餐"
;
//封装需要分享的对象
var
shareInfo
=
{
PNGUrl
:
pngUrl
,
ShareUrl
:
shareUrl
,
Title
:
title
,
Content
:
content
};
// 将对象转为字符串
shareInfo
=
JSON
.
stringify
(
shareInfo
);
hybrid_app
.
share
(
shareInfo
);
}
</script>
<script>
// 网鱼网咖图标额外奖励插件
...
...
@@ -141,7 +164,7 @@
});
</script>
<script>
// 星宿台本地
window
[
'projectId'
]
=
'local'
;
window
[
'projectId'
]
=
'local'
;
</script>
</body>
...
...
egret/src/Panels/TaskPanel.ts
View file @
94873383
...
...
@@ -126,22 +126,32 @@ class TaskItem extends eui.ItemRenderer {
this
.
btn_label
.
textColor
=
(
this
.
data
.
status
==
0
)
?
0xffffff
:
0x9a9a9a
;
this
.
btn_bg
.
visible
=
(
this
.
data
.
status
==
0
);
let
_f
=
()
=>
{
TopLayerCtrl
.
instance
.
show
(
ModuleTypes
.
TASK_TOAST
,
{
title
:
(
this
.
data
.
id
==
1
)
?
'签到成功'
:
'分享成功'
,
food
:
this
.
data
.
spFood1RewardNum
,
water
:
this
.
data
.
spFood2RewardNum
,
});
IndexDispatcher
.
dispatchEvent
(
'getTaskInfo'
);
IndexDispatcher
.
dispatchEvent
(
'getPropInfo'
);
};
if
(
this
.
data
.
status
==
0
)
{
this
.
btn
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
NetManager
.
ins
.
doTask
((
success
,
res
)
=>
{
if
(
!
success
)
{
return
;
}
IndexDispatcher
.
dispatchEvent
(
'getTaskInfo'
);
IndexDispatcher
.
dispatchEvent
(
'getPropInfo'
);
if
(
this
.
data
.
id
==
1
||
this
.
data
.
id
==
2
)
{
TopLayerCtrl
.
instance
.
show
(
ModuleTypes
.
TASK_TOAST
,
{
title
:
(
this
.
data
.
id
==
1
)
?
'签到成功'
:
'分享成功'
,
food
:
this
.
data
.
spFood1RewardNum
,
water
:
this
.
data
.
spFood2RewardNum
,
}
);
(
this
.
data
.
id
==
2
)
?
(
window
[
'share'
]()
,
setTimeout
(()
=>
{
_f
();
},
3000
))
:
_f
(
);
}
else
{
IndexDispatcher
.
dispatchEvent
(
'getTaskInfo'
);
IndexDispatcher
.
dispatchEvent
(
'getPropInfo'
);
window
.
location
.
href
=
taskUi
[
this
.
data
.
id
].
link
;
}
},
this
.
data
.
id
);
...
...
mock/joyousManor/taskInfo.json
View file @
94873383
...
...
@@ -5,14 +5,14 @@
"id"
:
1
,
"spFood1RewardNum"
:
50
,
"spFood2RewardNum"
:
60
,
"status"
:
1
,
"status"
:
0
,
"type"
:
0
},
{
"id"
:
2
,
"spFood1RewardNum"
:
40
,
"spFood2RewardNum"
:
50
,
"status"
:
1
,
"status"
:
0
,
"type"
:
0
},
{
...
...
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