Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
php
/
dencare-game
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
48d74b06
authored
Aug 28, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
y
parent
c4ba24d3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
28 deletions
+26
-28
.idea/workspace.xml
+20
-21
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+0
-0
Public/static/css/main.css
+4
-4
Public/static/css/main.scss
+2
-3
Public/static/images/x-k-map.jpg
+0
-0
No files found.
.idea/workspace.xml
View file @
48d74b06
...
@@ -2,8 +2,11 @@
...
@@ -2,8 +2,11 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"393705e8-a82c-4795-9b3b-5f911ddba9ac"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"393705e8-a82c-4795-9b3b-5f911ddba9ac"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
afterPath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/images/x-k-map.jpg"
afterPath=
"$PROJECT_DIR$/Public/static/images/x-k-map.jpg"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/js/index.js"
afterPath=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/css/main.css"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.css"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/css/main.scss"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
</list>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
@@ -17,7 +20,7 @@
...
@@ -17,7 +20,7 @@
</component>
</component>
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<component
name=
"FileEditorManager"
>
<splitter
split-orientation=
"horizontal"
split-proportion=
"0.
6552995
4"
>
<splitter
split-orientation=
"horizontal"
split-proportion=
"0.
1069124
4"
>
<split-first>
<split-first>
<leaf>
<leaf>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"false"
>
...
@@ -164,11 +167,9 @@
...
@@ -164,11 +167,9 @@
<file
leaf-file-name=
"index.js"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"index.js"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"57"
>
<state
relative-caret-position=
"295"
>
<caret
line=
"102"
column=
"5"
lean-forward=
"false"
selection-start-line=
"102"
selection-start-column=
"5"
selection-end-line=
"105"
selection-end-column=
"18"
/>
<caret
line=
"292"
column=
"0"
lean-forward=
"false"
selection-start-line=
"292"
selection-start-column=
"0"
selection-end-line=
"292"
selection-end-column=
"0"
/>
<folding>
<folding
/>
<marker
date=
"1566922506000"
expanded=
"true"
signature=
"3349:3444"
ph=
"{...}"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -180,8 +181,8 @@
...
@@ -180,8 +181,8 @@
<file
leaf-file-name=
"main.scss"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"main.scss"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
135
"
>
<state
relative-caret-position=
"
249
"
>
<caret
line=
"
192"
column=
"1"
lean-forward=
"false"
selection-start-line=
"192"
selection-start-column=
"1"
selection-end-line=
"192"
selection-end-column=
"1
"
/>
<caret
line=
"
220"
column=
"10"
lean-forward=
"false"
selection-start-line=
"220"
selection-start-column=
"10"
selection-end-line=
"220"
selection-end-column=
"10
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -233,8 +234,8 @@
...
@@ -233,8 +234,8 @@
<option
value=
"$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Application/User/Controller/ReportController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/User/Controller/ReportController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
<option
value=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<option
value=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -588,12 +589,12 @@
...
@@ -588,12 +589,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1566667513502
</updated>
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"47
065
000"
/>
<workItem
from=
"1566667516612"
duration=
"47
286
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"47
065
000"
/>
<option
name=
"totallyTimeSpent"
value=
"47
286
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"33"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"0"
/>
<frame
x=
"33"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"0"
/>
...
@@ -825,21 +826,19 @@
...
@@ -825,21 +826,19 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/
css/main.scs
s"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/
js/index.j
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
13
5"
>
<state
relative-caret-position=
"
29
5"
>
<caret
line=
"
192"
column=
"1"
lean-forward=
"false"
selection-start-line=
"192"
selection-start-column=
"1"
selection-end-line=
"192"
selection-end-column=
"1
"
/>
<caret
line=
"
292"
column=
"0"
lean-forward=
"false"
selection-start-line=
"292"
selection-start-column=
"0"
selection-end-line=
"292"
selection-end-column=
"0
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/
js/index.j
s"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/
css/main.scs
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"57"
>
<state
relative-caret-position=
"249"
>
<caret
line=
"102"
column=
"5"
lean-forward=
"false"
selection-start-line=
"102"
selection-start-column=
"5"
selection-end-line=
"105"
selection-end-column=
"18"
/>
<caret
line=
"220"
column=
"10"
lean-forward=
"false"
selection-start-line=
"220"
selection-start-column=
"10"
selection-end-line=
"220"
selection-end-column=
"10"
/>
<folding>
<folding
/>
<marker
date=
"1566922506000"
expanded=
"true"
signature=
"3349:3444"
ph=
"{...}"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
View file @
48d74b06
No preview for this file type
Public/static/css/main.css
View file @
48d74b06
...
@@ -179,8 +179,8 @@ ul, li {
...
@@ -179,8 +179,8 @@ ul, li {
.page-through
.through-map
{
.page-through
.through-map
{
position
:
absolute
;
position
:
absolute
;
display
:
inline-block
;
display
:
inline-block
;
left
:
-2
88
px
;
left
:
-2
71
px
;
top
:
-6
9
px
;
top
:
-6
3
px
;
background
:
url("../images/x-k-map.jpg")
left
top
;
background
:
url("../images/x-k-map.jpg")
left
top
;
width
:
1177px
;
width
:
1177px
;
height
:
1375px
;
height
:
1375px
;
...
@@ -215,8 +215,8 @@ ul, li {
...
@@ -215,8 +215,8 @@ ul, li {
.page-through
.map-3
{
.page-through
.map-3
{
position
:
absolute
;
position
:
absolute
;
display
:
inline-block
;
display
:
inline-block
;
left
:
-6
px
;
left
:
37
px
;
top
:
26
3
px
;
top
:
26
9
px
;
background
:
url("../images/2-3.png")
left
top
;
background
:
url("../images/2-3.png")
left
top
;
width
:
539px
;
width
:
539px
;
height
:
605px
;
height
:
605px
;
...
...
Public/static/css/main.scss
View file @
48d74b06
...
@@ -197,7 +197,7 @@ ul, li {
...
@@ -197,7 +197,7 @@ ul, li {
overflow
:
hidden
;
overflow
:
hidden
;
background
:
#9bc2f6
;
background
:
#9bc2f6
;
.through-map
{
.through-map
{
@include
image_bounds_by_pos
(
"../images/x-k-map.jpg"
,-
2
88px
,
-69
px
);
@include
image_bounds_by_pos
(
"../images/x-k-map.jpg"
,-
2
71px
,
-63
px
);
-webkit-transform
:
scale
(
0
.5
);
-webkit-transform
:
scale
(
0
.5
);
animation
:
planetz_two
6s
ease-in
0s
infinite
forwards
;
animation
:
planetz_two
6s
ease-in
0s
infinite
forwards
;
-webkit-animation
:
planetz_two
6s
ease-in
0s
infinite
forwards
;
-webkit-animation
:
planetz_two
6s
ease-in
0s
infinite
forwards
;
...
@@ -219,8 +219,7 @@ ul, li {
...
@@ -219,8 +219,7 @@ ul, li {
}
}
.map-3
{
.map-3
{
@include
image_bounds_by_pos
(
"../images/2-3.png"
,
37px
,
269px
);
@include
image_bounds_by_pos
(
"../images/2-3.png"
,
-6px
,
263px
);
-webkit-transform
:
scale
(
0
);
-webkit-transform
:
scale
(
0
);
animation
:
planet
4s
ease-in
1s
infinite
forwards
;
animation
:
planet
4s
ease-in
1s
infinite
forwards
;
-webkit-animation
:
planet
4s
ease-in
1s
infinite
forwards
;
-webkit-animation
:
planet
4s
ease-in
1s
infinite
forwards
;
...
...
Public/static/images/x-k-map.jpg
View file @
48d74b06
71.6 KB
|
W:
|
H:
428 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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