Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
babycare_xiaoxiao
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
王剑峰
babycare_xiaoxiao
Commits
f8c6e81f
Commit
f8c6e81f
authored
Jul 14, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
map effect
parent
2c58de48
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
workspace.xml
.idea/workspace.xml
+16
-14
MapMid.ts
src/scene/map/MapMid.ts
+1
-1
No files found.
.idea/workspace.xml
View file @
f8c6e81f
...
@@ -2,13 +2,8 @@
...
@@ -2,13 +2,8 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"9cef0552-af3c-4a1c-be1f-dc41ebe5b6db"
name=
"Default Changelist"
comment=
""
>
<list
default=
"true"
id=
"9cef0552-af3c-4a1c-be1f-dc41ebe5b6db"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/src/panels/RulePanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/SkinJson.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/SkinJson.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scene/map/MapMid.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/MapMid.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/StartPanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/StartPanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/StartPanelPrize.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/StartPanelPrize.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scene/map/MapScene.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/MapScene.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scene/map/MapUI.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/MapUI.ts"
afterDir=
"false"
/>
</list>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
@@ -106,7 +101,7 @@
...
@@ -106,7 +101,7 @@
<workItem
from=
"1594111755267"
duration=
"29551000"
/>
<workItem
from=
"1594111755267"
duration=
"29551000"
/>
<workItem
from=
"1594260676967"
duration=
"30060000"
/>
<workItem
from=
"1594260676967"
duration=
"30060000"
/>
<workItem
from=
"1594604662575"
duration=
"27200000"
/>
<workItem
from=
"1594604662575"
duration=
"27200000"
/>
<workItem
from=
"1594691193000"
duration=
"4
649
000"
/>
<workItem
from=
"1594691193000"
duration=
"4
947
000"
/>
</task>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
<created>
1594122339119
</created>
...
@@ -157,7 +152,14 @@
...
@@ -157,7 +152,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1594693383765
</updated>
<updated>
1594693383765
</updated>
</task>
</task>
<option
name=
"localTasksCounter"
value=
"8"
/>
<task
id=
"LOCAL-00008"
summary=
"map effect"
>
<created>
1594695870103
</created>
<option
name=
"number"
value=
"00008"
/>
<option
name=
"presentableId"
value=
"LOCAL-00008"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1594695870103
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"9"
/>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
@@ -181,10 +183,10 @@
...
@@ -181,10 +183,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"251"
y=
"471"
key=
"ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594113080922"
/>
<state
x=
"251"
y=
"471"
key=
"ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594113080922"
/>
<state
x=
"754"
y=
"183"
key=
"CommitChangelistDialog2"
timestamp=
"159469
3383238
"
>
<state
x=
"754"
y=
"183"
key=
"CommitChangelistDialog2"
timestamp=
"159469
5869890
"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"754"
y=
"183"
key=
"CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"159469
3383238
"
/>
<state
x=
"754"
y=
"183"
key=
"CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"159469
5869890
"
/>
<state
width=
"882"
height=
"329"
key=
"GridCell.Tab.0.bottom"
timestamp=
"1594693733806"
>
<state
width=
"882"
height=
"329"
key=
"GridCell.Tab.0.bottom"
timestamp=
"1594693733806"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
...
@@ -209,10 +211,10 @@
...
@@ -209,10 +211,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"31"
y=
"250"
key=
"SettingsEditor/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594195630991"
/>
<state
x=
"31"
y=
"250"
key=
"SettingsEditor/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594195630991"
/>
<state
x=
"92"
y=
"351"
key=
"Vcs.Push.Dialog.v2"
timestamp=
"159469
338541
5"
>
<state
x=
"92"
y=
"351"
key=
"Vcs.Push.Dialog.v2"
timestamp=
"159469
587172
5"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"92"
y=
"351"
key=
"Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"159469
338541
5"
/>
<state
x=
"92"
y=
"351"
key=
"Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"159469
587172
5"
/>
<state
x=
"87"
y=
"216"
key=
"com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser"
timestamp=
"1594111906161"
>
<state
x=
"87"
y=
"216"
key=
"com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser"
timestamp=
"1594111906161"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
...
@@ -237,9 +239,9 @@
...
@@ -237,9 +239,9 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"157"
y=
"286"
key=
"run.anything.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594188122355"
/>
<state
x=
"157"
y=
"286"
key=
"run.anything.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594188122355"
/>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"159469
5829743
"
>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"159469
6135124
"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"159469
5829743
"
/>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"159469
6135124
"
/>
</component>
</component>
</project>
</project>
\ No newline at end of file
src/scene/map/MapMid.ts
View file @
f8c6e81f
...
@@ -91,7 +91,7 @@ export default class MapMid extends MapPart {
...
@@ -91,7 +91,7 @@ export default class MapMid extends MapPart {
||
this
.
stage
.
viewRect
.
isPointIn
(
ucp
)
||
this
.
stage
.
viewRect
.
isPointIn
(
ucp
)
||
this
.
stage
.
viewRect
.
isPointIn
(
bcp
);
||
this
.
stage
.
viewRect
.
isPointIn
(
bcp
);
if
(
this
.
waterIndex
++
>
5
)
{
if
(
this
.
waterIndex
++
>
6
)
{
this
.
waterIndex1
=
!
this
.
waterIndex1
;
this
.
waterIndex1
=
!
this
.
waterIndex1
;
this
.
water
.
texture
=
this
.
waterIndex1
?
this
.
water1
:
this
.
water2
;
this
.
water
.
texture
=
this
.
waterIndex1
?
this
.
water1
:
this
.
water2
;
this
.
waterIndex
=
0
;
this
.
waterIndex
=
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