Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckyFarm
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
LuckyFarm
Commits
fefeb972
Commit
fefeb972
authored
Dec 03, 2020
by
wangxuewei
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_dd_garden_1.0.1' into develop_dd_garden_1.0.1
parents
4a5ff1ca
fe5e1091
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
1 deletion
+0
-1
MainDialog.kt
app/src/main/java/com/ym/game/view/MainDialog.kt
+0
-1
icon_speed_cloud_title.png
app/src/main/res/drawable-xhdpi/icon_speed_cloud_title.png
+0
-0
icon_zhuanpan_bg.png
app/src/main/res/mipmap-xhdpi/icon_zhuanpan_bg.png
+0
-0
No files found.
app/src/main/java/com/ym/game/view/MainDialog.kt
View file @
fefeb972
...
...
@@ -466,7 +466,6 @@ object MainDialog {
if
(
id
!=
null
)
{
when
(
id
)
{
1
->
{
Log
.
e
(
"MXL"
,
"show_baicai"
)
EventUtils
.
onEvent
(
"show_hongmeigui"
,
"红玫瑰"
+
jine
)
}
2
->
{
...
...
app/src/main/res/drawable-xhdpi/icon_speed_cloud_title.png
View replaced file @
4a5ff1ca
View file @
fefeb972
32.6 KB
|
W:
|
H:
32.8 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/src/main/res/mipmap-xhdpi/icon_zhuanpan_bg.png
View replaced file @
4a5ff1ca
View file @
fefeb972
231 KB
|
W:
|
H:
242 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