Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qiaqia_qx
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
邱旭
qiaqia_qx
Commits
96260391
Commit
96260391
authored
Jun 11, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
guide
parent
43775945
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
39 deletions
+21
-39
workspace.xml
.idea/workspace.xml
+18
-36
GuideLayer.ts
src/parts/Game/GuideLayer.ts
+3
-3
No files found.
.idea/workspace.xml
View file @
96260391
...
...
@@ -2,35 +2,7 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"31be0130-d27d-4740-b668-956a8050e1bf"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/mock/miniTb/qiaqia2.receiveEnamePrize.json"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/mock/miniTb/qiaqiaHome.doNoviceGuide.json"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/resource/exRecordPanel/record_dis.png"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/resource/exRecordPanel/record_en.png"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/resource/guidePanel/guide_bg.png"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/resource/guidePanel/guide_btn.png"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/src/panels/GuidePanel.ts"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/src/parts/Game/GuideLayer.ts"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/src/scenes/GuideScene.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/miniTb/qiaqia2.getMyPrizeList.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/qiaqia2.getMyPrizeList.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/output.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/output.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/released/resource/exRecordPanel/exRecordPanel.png"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/released/resource/exRecordPanel/exRecordPanel.png"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/released/resource/res.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/released/resource/res.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/resource/res.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/resource/res.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/resource/wareHouse/wareHouse_山核桃.png"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/resource/wareHouse/wareHouse_核桃.png"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/ResJson.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/ResJson.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/TaoBaoNet.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/TaoBaoNet.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/const/GEVENT.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/const/GEVENT.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/ExRecordPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/ExRecordPanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/TaskPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/TaskPanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/parts/Game/GameLayer.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/parts/Game/GameLayer.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/parts/Game/Land.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/parts/Game/Land.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/parts/Game/PlantList.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/parts/Game/PlantList.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/parts/Game/ProgressBar.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/parts/Game/ProgressBar.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/parts/UI/UILayer.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/parts/UI/UILayer.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scenes/GameScene.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scenes/GameScene.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scenes/LoadingScene.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scenes/LoadingScene.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/parts/Game/GuideLayer.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/parts/Game/GuideLayer.ts"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -178,7 +150,7 @@
<workItem
from=
"1591667441623"
duration=
"25180000"
/>
<workItem
from=
"1591753635902"
duration=
"11045000"
/>
<workItem
from=
"1591771023496"
duration=
"19835000"
/>
<workItem
from=
"1591840410673"
duration=
"32
183
000"
/>
<workItem
from=
"1591840410673"
duration=
"32
240
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"1"
>
<created>
1591003912929
</created>
...
...
@@ -432,7 +404,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1591846771404
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"37"
/>
<task
id=
"LOCAL-00037"
summary=
"guide"
>
<created>
1591876051550
</created>
<option
name=
"number"
value=
"00037"
/>
<option
name=
"presentableId"
value=
"LOCAL-00037"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1591876051550
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"38"
/>
<servers
/>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
...
@@ -471,7 +450,8 @@
<MESSAGE
value=
"res"
/>
<MESSAGE
value=
"exchangePanel"
/>
<MESSAGE
value=
"111"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"111"
/>
<MESSAGE
value=
"guide"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"guide"
/>
</component>
<component
name=
"WindowStateProjectService"
>
<state
x=
"323"
y=
"198"
key=
"#com.intellij.execution.impl.EditConfigurationsDialog"
timestamp=
"1591790199346"
>
...
...
@@ -482,9 +462,10 @@
<screen
x=
"37"
y=
"23"
width=
"1643"
height=
"1027"
/>
</state>
<state
x=
"671"
y=
"259"
key=
"#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027"
timestamp=
"1591344864454"
/>
<state
x=
"
467"
y=
"108"
key=
"CommitChangelistDialog2"
timestamp=
"1591846770902
"
>
<screen
x=
"
37"
y=
"23"
width=
"1643"
height=
"102
7"
/>
<state
x=
"
502"
y=
"120"
key=
"CommitChangelistDialog2"
timestamp=
"1591876050853
"
>
<screen
x=
"
0"
y=
"23"
width=
"1920"
height=
"117
7"
/>
</state>
<state
x=
"502"
y=
"120"
key=
"CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177"
timestamp=
"1591876050853"
/>
<state
x=
"466"
y=
"108"
key=
"CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027"
timestamp=
"1591003912498"
/>
<state
x=
"2182"
y=
"-102"
key=
"CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177"
timestamp=
"1591189619717"
/>
<state
x=
"467"
y=
"108"
key=
"CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027"
timestamp=
"1591846770902"
/>
...
...
@@ -535,9 +516,10 @@
</state>
<state
x=
"614"
y=
"245"
key=
"RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027"
timestamp=
"1590993046653"
/>
<state
x=
"615"
y=
"245"
key=
"RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027"
timestamp=
"1591077661188"
/>
<state
x=
"4
57"
y=
"276"
key=
"Vcs.Push.Dialog.v2"
timestamp=
"1591846773289
"
>
<screen
x=
"
37"
y=
"23"
width=
"1643"
height=
"102
7"
/>
<state
x=
"4
91"
y=
"313"
key=
"Vcs.Push.Dialog.v2"
timestamp=
"1591876053307
"
>
<screen
x=
"
0"
y=
"23"
width=
"1920"
height=
"117
7"
/>
</state>
<state
x=
"491"
y=
"313"
key=
"Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177"
timestamp=
"1591876053307"
/>
<state
x=
"2171"
y=
"91"
key=
"Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177"
timestamp=
"1591189622538"
/>
<state
x=
"457"
y=
"276"
key=
"Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027"
timestamp=
"1591846773289"
/>
<state
x=
"417"
y=
"141"
key=
"com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser"
timestamp=
"1591269112575"
>
...
...
src/parts/Game/GuideLayer.ts
View file @
96260391
...
...
@@ -293,7 +293,7 @@ export default class GuideLayer extends Container {
this
.
taskBtn
.
once
(
MouseEvent
.
CLICK
,
()
=>
{
sendTbNet
(
TbNetName
.
guide
,
{
activityId
:
activityId
,
index
:
5
index
:
6
},
(
success
,
res
)
=>
{
if
(
!
success
)
return
;
this
.
showGuide7
();
...
...
@@ -313,7 +313,7 @@ export default class GuideLayer extends Container {
this
.
wareHouseBtn
.
once
(
MouseEvent
.
CLICK
,
()
=>
{
sendTbNet
(
TbNetName
.
guide
,
{
activityId
:
activityId
,
index
:
5
index
:
7
},
(
success
,
res
)
=>
{
if
(
!
success
)
return
;
this
.
showGuide8
();
...
...
@@ -333,7 +333,7 @@ export default class GuideLayer extends Container {
this
.
storeBtn
.
once
(
MouseEvent
.
CLICK
,
()
=>
{
sendTbNet
(
TbNetName
.
guide
,
{
activityId
:
activityId
,
index
:
5
index
:
8
},
(
success
,
res
)
=>
{
if
(
!
success
)
return
;
this
.
hideBg
();
...
...
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