Merge branch 'develop_ddcy_1.0.3' of gitlab.huolea.com:wangxuewei/luckyfarm into develop_ddcy_1.0.3

# Conflicts:
#	game/src/main/assets/bin/Data/Managed/UnityGameFramework.Runtime.dll
#	game/src/main/assets/bin/Data/sharedassets1.assets.split42
#	game/src/main/assets/bin/Data/sharedassets1.assets.split43
#	game/src/main/assets/bin/Data/sharedassets1.assets.split44
#	game/src/main/assets/bin/Data/sharedassets1.assets.split45
#	game/src/main/assets/bin/Data/sharedassets1.assets.split46

app/src/main/java/com/ym/game/GameActivity.kt

@@ -364,7 +364,12 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                 override fun onSuccess(result: List<LandListEntity>?) {
                     var json = "{\"landList\":" + Utils.obj2Str(result) + "}"
                     Log.d("Wxw", "初始化地块列表成功$from$json")
-                    callUnity("Canvas", "loadLandListSuccess", json)
+                    if(from==1){
+                        callUnity("Canvas", "loadLandListSuccess", json)
+                    }
+                    if (from == 2){
+                        callUnity("Form_land", "sycnLandListSuccess", json)
+                    }
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
@@ -588,7 +593,19 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                 }
             })
     }
+    //加速剂
+    fun getUseAcceleratorsSync(id: Int) {
+        GameApiClient.gameApi.getUseAccelerators(id).compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<StatusEntity>() {
+                override fun onSuccess(result: StatusEntity?) {
+                    Log.d("wxw", "加速剂同步" + Utils.obj2Str(result))
+                }
 
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "加速剂同步 error")
+                }
+            })
+    }
     //金币购买种子
     fun getBuySeed(callback: IUnitySendMessageCallback?, id: Int) {
         GameApiClient.gameApi.getBuySeed(id).compose(RxSchedulers.observableIO2Main())
@@ -756,6 +773,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                             .compose(RxSchedulers.observableIO2Main())
                             .subscribe(object : BaseObserver<StatusEntity>() {
                                 override fun onSuccess(result: StatusEntity?) {
+                                    result?.id=id
                                     Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result))
                                     callback?.onIncrVideoAcceleratorsSuccess(
                                         true,

library/src/main/java/com/ym/library/module/HomeInfoEntity.java

@@ -27,6 +27,24 @@ public class HomeInfoEntity {
     private int plantBoxNum;
     private int currentClockNum;//当前打卡数量
     private int maxClockNum;//所需打卡数量
+    private int subAcceleratorsVideoNum;//看加速剂不足视频剩余次数
+    private int subSeedVideoNum;//看种子不足视频剩余次数
+
+    public int getSubAcceleratorsVideoNum() {
+        return subAcceleratorsVideoNum;
+    }
+
+    public void setSubAcceleratorsVideoNum(int subAcceleratorsVideoNum) {
+        this.subAcceleratorsVideoNum = subAcceleratorsVideoNum;
+    }
+
+    public int getSubSeedVideoNum() {
+        return subSeedVideoNum;
+    }
+
+    public void setSubSeedVideoNum(int subSeedVideoNum) {
+        this.subSeedVideoNum = subSeedVideoNum;
+    }
 
     public int getCurrentClockNum() {
         return currentClockNum;

library/src/main/java/com/ym/library/module/StatusEntity.java

@@ -16,6 +16,15 @@ public class StatusEntity {
     private int needCoin;
     private int videoNum;
     private  int awardNum;
+    private int acceleratorsNum;
+
+    public int getAcceleratorsNum() {
+        return acceleratorsNum;
+    }
+
+    public void setAcceleratorsNum(int acceleratorsNum) {
+        this.acceleratorsNum = acceleratorsNum;
+    }
 
     public int getAwardNum() {
         return awardNum;

library/src/main/java/com/ym/library/net/SplashPresenter.kt

@@ -6,6 +6,7 @@ import android.text.TextUtils
 import com.ym.library.Constant
 import com.ym.library.utils.*
 import com.ym.modulecommon.AppliContext
+import com.ym.modulecommon.Config
 import com.ym.modulecommon.module.UserInfoEntity
 import io.reactivex.Observable
 import io.reactivex.ObservableOnSubscribe
@@ -115,6 +116,7 @@ class SplashPresenter : SplashContract.Presenter {
 
 
     private fun initConfig(mNovelInitEntity: NovelInitEntity) {
+        Config.init(mActivity)
         EventUtils.onEvent("SplashPresenter_initConfig")
         NetConfig.Other.HELP_AND_FEEDBACK_URL = mNovelInitEntity?.help
         NetConfig.Other.PRIVACY_PROTOCOL_URL = mNovelInitEntity?.agreement