Merge branch 'dev_6.6.4_战令'

# Conflicts: # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # config.gradle
2024-01-05 14:00:39 +08:00
parent f697e650a8 4a5e581978
commit 43d1abbae0
185 changed files with 5907 additions and 710 deletions
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -191,7 +191,7 @@ dependencies {
    api 'com.github.princekin-f:EasyFloat:2.0.4'
    api files('libs/Msc.jar')

-    api 'com.github.li-xiaojun:XPopup:2.9.1'
+    api 'com.github.li-xiaojun:XPopup:2.10.0'

    api 'com.github.shenbengit:PagerGridLayoutManager:1.1.7'
    //选择器