moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]夺宝精灵功能修改

Browse Source
This commit is contained in:
wushaocheng
2023-09-08 11:55:52 +08:00
parent 068172bbd2
commit 7548b4174a
18 changed files with 304 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@@ -6,9 +6,6 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.tencent.vasdolly'
apply from: '../mob.gradle'
configurations.maybeCreate("default")
artifacts.add("default", file('SudMGP-v1.1.52.554.aar'))
def onlyArm64 = Boolean.parseBoolean(only_arm64)
android {
@@ -290,6 +287,8 @@ dependencies {
//wheelView
implementation 'com.contrarywind:wheelview:4.1.0'
implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
}
channel {

BIN
app/libs/SudMGP-v1.1.52.554.aar
View File

Binary file not shown.

71
app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
View File

@@ -22,10 +22,7 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.common.widget.dialog.DialogManager
import com.yizhuan.erban.databinding.TreasureFairyDialogHomeBinding
import com.yizhuan.erban.treasurefairy.dialog.ForestFairyDialog
import com.yizhuan.erban.treasurefairy.dialog.HomeMorePopupWindow
import com.yizhuan.erban.treasurefairy.dialog.HomePrizeDialog
import com.yizhuan.erban.treasurefairy.dialog.MyFairyDialog
import com.yizhuan.erban.treasurefairy.dialog.*
import com.yizhuan.erban.treasurefairy.view.CustomDrawable
import com.yizhuan.erban.ui.webview.FairyDialogWebViewActivity
import com.yizhuan.erban.utils.SpannableBuilder
@@ -64,6 +61,8 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
private var isCheck = false
private var isSelect = false
companion object {
@JvmStatic
fun start(context: Context) {
@@ -96,16 +95,33 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(this)
)
window.setGravity(Gravity.BOTTOM)
binding.fairyItem0.isSelected = true
looperHintPrize()
binding.tvKeyNum.setOnClickListener {
FairyDialogWebViewActivity.start(this, UriProvider.getFairyKey())
binding.viewPrice1.setOnClickListener {
setFairyPriceSelect(1)
}
binding.viewPrice2.setOnClickListener {
setFairyPriceSelect(2)
}
binding.viewPrice3.setOnClickListener {
setFairyPriceSelect(3)
}
binding.tvBuy.setOnClickListener {
if(!isSelect){
toast("請選擇購買的碎片數量")
}
}
// binding.tvKeyNum.setOnClickListener {
// FairyDialogWebViewActivity.start(this, UriProvider.getFairyKey())
// }
binding.ivMyFairy.setOnClickListener {
MyFairyDialog.newInstance().show(this)
}
binding.ivFairyTreasure.setOnClickListener {
ForestFairyDialog.newInstance().show(this)
binding.ivFairyStore.setOnClickListener {
ExchangeFairyDialog.newInstance().show(context)
}
binding.ivOpen1.setOnClickListener {
if (checkKeyNum(1)) {
@@ -220,6 +236,45 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
}
}
private fun setFairyPriceSelect(pos: Int) {
isSelect = true
when(pos){
1 ->{
binding.viewPrice1.isSelected = true
binding.viewPrice2.isSelected = false
binding.viewPrice3.isSelected = false
binding.ivDebris1.alpha = 1f
binding.ivDebris2.alpha = 0.4f
binding.ivDebris3.alpha = 0.4f
binding.tvOne.alpha = 1f
binding.tvTwo.alpha = 0.4f
binding.tvThree.alpha = 0.4f
}
2 ->{
binding.viewPrice1.isSelected = false
binding.viewPrice2.isSelected = true
binding.viewPrice3.isSelected = false
binding.ivDebris1.alpha = 0.4f
binding.ivDebris2.alpha = 1f
binding.ivDebris3.alpha = 0.4f
binding.tvOne.alpha = 0.4f
binding.tvTwo.alpha = 1f
binding.tvThree.alpha = 0.4f
}
3 ->{
binding.viewPrice1.isSelected = false
binding.viewPrice2.isSelected = false
binding.viewPrice3.isSelected = true
binding.ivDebris1.alpha = 0.4f
binding.ivDebris2.alpha = 0.4f
binding.ivDebris3.alpha = 1f
binding.tvOne.alpha = 0.4f
binding.tvTwo.alpha = 0.4f
binding.tvThree.alpha = 1f
}
}
}
private fun checkKeyNum(num: Int): Boolean {
val keyNum = drawInfo?.drawTicketNum ?: 0
if (keyNum >= num) {

3
app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt
View File

@@ -42,6 +42,9 @@ class MyFairyDialog : BaseDialog<TreasureFairyDialogMyFairyBinding>() {
binding?.ivBack?.setOnClickListener {
dismissAllowingStateLoss()
}
binding?.ivFairyTest?.setOnClickListener {
TestFairyDialog.newInstance().show(context)
}
binding?.ivRecord?.setOnClickListener {
MyFairyRecordDialog.newInstance().show(context)
}

BIN
app/src/main/res/drawable-xhdpi/bg_buy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_fairy_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_debris.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/drawable-xhdpi/treasure_fairy_bg_key_number.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

15
app/src/main/res/drawable/bg_17303c_284d5a_15.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="0"
android:endColor="#ff284d5a"
android:startColor="#ff17303c"
android:type="linear"
android:useLevel="true" />
<stroke
android:width="0.5dp"
android:color="@color/color_white_60" />
<corners
android:radius="@dimen/dp_15" />
</shape>

6
app/src/main/res/drawable/bg_19ffffff_10.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#19ffffff" />
<corners android:radius="@dimen/dp_10" />
</shape>

9
app/src/main/res/drawable/bg_19ffffff_stroke_f2de84_10.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#19ffffff" />
<corners android:radius="@dimen/dp_10" />
<stroke
android:width="0.5dp"
android:color="@color/color_F2DE84" />
</shape>

7
app/src/main/res/drawable/selector_bg_fairy_price.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_19ffffff_stroke_f2de84_10" android:state_selected="true" />
<item android:drawable="@drawable/bg_19ffffff_10" />
</selector>

2
app/src/main/res/layout/treasure_fairy_dialog_forest.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="0dp"
android:background="@drawable/treasure_fairy_bg_home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="750:1160"
app:layout_constraintDimensionRatio="750:1245"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

211
app/src/main/res/layout/treasure_fairy_dialog_home.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="0dp"
android:background="@drawable/treasure_fairy_bg_home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="750:1160"
app:layout_constraintDimensionRatio="750:1245"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@@ -29,41 +29,33 @@
<TextView
android:id="@+id/tv_key_num"
android:layout_width="77dp"
android:layout_height="24dp"
android:layout_width="66dp"
android:layout_height="@dimen/dp_28"
android:layout_marginStart="30dp"
android:background="@drawable/treasure_fairy_bg_key"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textColor="@color/color_F6F6F6"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="@id/iv_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/iv_more" />
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/treasure_fairy_bg_key_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_8"
app:layout_constraintEnd_toEndOf="@+id/tv_key_num"
app:layout_constraintTop_toTopOf="@+id/tv_key_num"
app:layout_constraintBottom_toBottomOf="@+id/tv_key_num"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/treasure_fairy_bg_key_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@+id/tv_key_num"
app:layout_constraintBottom_toBottomOf="@+id/tv_key_num"
app:layout_constraintEnd_toStartOf="@+id/tv_key_num"
app:layout_constraintBottom_toBottomOf="@+id/tv_key_num"/>
app:layout_constraintStart_toStartOf="@+id/tv_key_num"
app:layout_constraintTop_toTopOf="@+id/tv_key_num" />
<ImageView
android:id="@+id/iv_fairy_treasure"
android:id="@+id/iv_fairy_store"
android:layout_width="50dp"
android:layout_height="46dp"
android:layout_marginEnd="4dp"
android:src="@drawable/treasure_fairy_ic_fairy_treasure"
android:src="@drawable/treasure_fairy_ic_forest_store"
app:layout_constraintBottom_toBottomOf="@id/iv_more"
app:layout_constraintEnd_toStartOf="@id/iv_my_fairy" />
@@ -290,31 +282,31 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_win_result"
android:text="@string/Winning_results_are_not_displayed"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_4"
android:text="@string/Winning_results_are_not_displayed"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="@+id/cbWinResult"
app:layout_constraintEnd_toStartOf="@+id/cbWinResult"
app:layout_constraintTop_toTopOf="@+id/cbWinResult"
app:layout_constraintBottom_toBottomOf="@+id/cbWinResult"/>
app:layout_constraintTop_toTopOf="@+id/cbWinResult" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/cbWinResult"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_select_win_result"
app:layout_constraintEnd_toEndOf="@+id/iv_open_100"
app:layout_constraintBottom_toTopOf="@+id/iv_open_100"/>
app:layout_constraintBottom_toTopOf="@+id/iv_open_100"
app:layout_constraintEnd_toEndOf="@+id/iv_open_100" />
<ImageView
android:id="@+id/iv_open_1"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="35dp"
android:layout_marginBottom="@dimen/dp_8"
android:src="@drawable/treasure_fairy_bg_open_1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
app:layout_constraintDimensionRatio="230:89"
app:layout_constraintEnd_toStartOf="@id/iv_open_10"
app:layout_constraintHorizontal_chainStyle="packed"
@@ -326,9 +318,9 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="1dp"
android:layout_marginBottom="35dp"
android:layout_marginBottom="@dimen/dp_8"
android:src="@drawable/treasure_fairy_bg_open_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
app:layout_constraintDimensionRatio="230:89"
app:layout_constraintEnd_toStartOf="@id/iv_open_100"
app:layout_constraintStart_toEndOf="@id/iv_open_1"
@@ -339,14 +331,173 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="1dp"
android:layout_marginBottom="35dp"
android:layout_marginBottom="@dimen/dp_8"
android:src="@drawable/treasure_fairy_bg_open_100"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
app:layout_constraintDimensionRatio="230:89"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_open_10"
app:layout_constraintWidth_percent="0.306" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_bottom"
android:layout_width="match_parent"
android:layout_height="67dp"
android:background="@drawable/bg_fairy_bottom"
app:layout_constraintBottom_toBottomOf="parent">
<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_24"
android:background="@drawable/bg_17303c_284d5a_15"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view_price_1"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_12"
android:background="@drawable/selector_bg_fairy_price"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintDimensionRatio="44:20"
app:layout_constraintStart_toStartOf="@+id/view"
app:layout_constraintTop_toTopOf="@+id/view"
app:layout_constraintWidth_percent="0.12" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_debris_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:background="@drawable/ic_debris"
android:alpha="0.4"
app:layout_constraintBottom_toBottomOf="@+id/view_price_1"
app:layout_constraintStart_toStartOf="@+id/view_price_1"
app:layout_constraintTop_toTopOf="@+id/view_price_1" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:textColor="@color/color_F6F6F6"
android:textSize="@dimen/sp_12"
android:layout_marginStart="@dimen/dp_6"
android:alpha="0.4"
app:layout_constraintBottom_toBottomOf="@+id/view_price_1"
app:layout_constraintStart_toEndOf="@+id/iv_debris_1"
app:layout_constraintTop_toTopOf="@+id/view_price_1" />
<View
android:id="@+id/view_price_2"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_12"
android:background="@drawable/selector_bg_fairy_price"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintDimensionRatio="44:20"
app:layout_constraintStart_toEndOf="@+id/view_price_1"
app:layout_constraintTop_toTopOf="@+id/view"
app:layout_constraintWidth_percent="0.12" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_debris_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:background="@drawable/ic_debris"
android:alpha="0.4"
app:layout_constraintBottom_toBottomOf="@+id/view_price_2"
app:layout_constraintStart_toStartOf="@+id/view_price_2"
app:layout_constraintTop_toTopOf="@+id/view_price_2" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_two"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10"
android:textColor="@color/color_F6F6F6"
android:textSize="@dimen/sp_12"
android:layout_marginStart="@dimen/dp_4"
android:alpha="0.4"
app:layout_constraintBottom_toBottomOf="@+id/view_price_2"
app:layout_constraintStart_toEndOf="@+id/iv_debris_2"
app:layout_constraintTop_toTopOf="@+id/view_price_2" />
<View
android:id="@+id/view_price_3"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_12"
android:background="@drawable/selector_bg_fairy_price"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintDimensionRatio="44:20"
app:layout_constraintStart_toEndOf="@+id/view_price_2"
app:layout_constraintTop_toTopOf="@+id/view"
app:layout_constraintWidth_percent="0.12" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_debris_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:background="@drawable/ic_debris"
android:alpha="0.4"
app:layout_constraintBottom_toBottomOf="@+id/view_price_3"
app:layout_constraintStart_toStartOf="@+id/view_price_3"
app:layout_constraintTop_toTopOf="@+id/view_price_3" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_three"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="100"
android:textColor="@color/color_F6F6F6"
android:textSize="@dimen/sp_12"
android:layout_marginStart="@dimen/dp_2"
android:alpha="0.4"
app:layout_constraintBottom_toBottomOf="@+id/view_price_3"
app:layout_constraintStart_toEndOf="@+id/iv_debris_3"
app:layout_constraintTop_toTopOf="@+id/view_price_3" />
<com.coorchice.library.SuperTextView
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_8"
android:gravity="center"
android:text="輸入數量"
android:textColor="@color/color_66F6F6F6"
android:textSize="@dimen/sp_9"
app:corner="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintDimensionRatio="60:20"
app:layout_constraintEnd_toStartOf="@+id/tv_buy"
app:layout_constraintTop_toTopOf="@+id/view"
app:layout_constraintWidth_percent="0.16"
app:solid="@color/color_365A65" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_buy"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_22"
android:layout_marginEnd="@dimen/dp_4"
android:background="@drawable/bg_buy"
android:gravity="center"
android:text="購買"
android:textColor="@color/color_1f5764"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintDimensionRatio="60:22"
app:layout_constraintEnd_toEndOf="@+id/view"
app:layout_constraintTop_toTopOf="@+id/view"
app:layout_constraintWidth_percent="0.16" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_prize_hint"
android:layout_width="wrap_content"

12
app/src/main/res/layout/treasure_fairy_dialog_my_fairy.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="0dp"
android:background="@drawable/treasure_fairy_bg_home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="750:1160"
app:layout_constraintDimensionRatio="750:1245"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@@ -37,6 +37,16 @@
app:layout_constraintTop_toTopOf="@id/view_bg"
app:layout_constraintWidth_percent="0.408" />
<ImageView
android:id="@+id/iv_fairy_test"
android:layout_width="50dp"
android:layout_height="42dp"
android:layout_marginEnd="4dp"
android:layout_marginStart="@dimen/dp_15"
android:src="@drawable/treasure_fairy_bg_forest_test"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_title" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/treasure_fairy_dialog_test_fairy.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="0dp"
android:background="@drawable/treasure_fairy_bg_home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="750:1160"
app:layout_constraintDimensionRatio="750:1245"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

5
app/src/main/res/values/colors.xml
View File

@@ -49,6 +49,7 @@
<color name="white_op_30">#B3FFFFFF</color>
<color name="white_tran_10">#19FFFFFF</color>
<color name="white_tran_20">#33FFFFFF</color>
<color name="white_tran_40">#66FFFFFF</color>
<color name="white_transparent_12">#1EFFFFFF</color>
<color name="white_transparent_14">#23FFFFFF</color>
@@ -679,5 +680,9 @@
<color name="color_B8B7C7">#B8B7C7</color>
<color name="color_FAFBFC">#FAFBFC</color>
<color name="color_767585">#767585</color>
<color name="color_F2DE84">#F2DE84</color>
<color name="color_365A65">#365A65</color>
<color name="color_F6F6F6">#F6F6F6</color>
<color name="color_66F6F6F6">#66F6F6F6</color>
</resources>

BIN
app/src/module_treasure_box/res/drawable-xhdpi/treasure_box_bg_normal.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 KiB

After

Width:  |  Height:  |  Size: 28 KiB