Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

# Conflicts:
#	assets/gameMath/bgAni/34.meta

assets/gameMath/bgAni/23/238_1.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 2660,
-  "height": 800,
+  "width": 2560,
+  "height": 239,
   "platformSettings": {},
   "subMetas": {
     "238_1": {

assets/gameMath/bgAni/56/563_1.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1280,
+  "width": 2560,
   "height": 171,
   "platformSettings": {},
   "subMetas": {

assets/scene/Editor.fire

@@ -174,7 +174,7 @@
       "array": [
         0,
         0,
-        525.2308757483279,
+        209.57814771583418,
         0,
         0,
         0,

assets/script/ui/child/GameUI.ts

@@ -19,13 +19,17 @@ export class GameUI extends BaseUI {
         let getGameJson = () => {
             return PathUtils.addGP('data_' + [Data.game.semeID, Data.game.gameID, Data.game.partID].join('_'))
         }
-        let getBgAniJson = () => {
-            let arr = [Data.game.semeYear, Data.game.gameID]
+        let getBgAniJson = async (isSemeYear: boolean) => {
+            let key = isSemeYear ? Data.game.semeYear : Data.game.semeID
+            let arr = [key, Data.game.gameID]
             if (Data.game.curGameType == GAME_TYPE.gameEndless) arr.push(Data.game.partID)
-            return 'bgAni/' + Data.game.semeYear + '/bgAni_' + arr.join('_')
+            let url = 'bgAni/' + key + '/bgAni_' + arr.join('_')
+            let jsonAsset: cc.JsonAsset = await this.loadSync(Data.game.gameBundle, url, cc.JsonAsset)
+            return jsonAsset
         }
         let gameJson: cc.JsonAsset = await this.loadSync(Data.game.semeBundle, getGameJson(), cc.JsonAsset)
-        let bgAniJson: cc.JsonAsset = await this.loadSync(Data.game.gameBundle, getBgAniJson(), cc.JsonAsset)
+        let bgAniJson: cc.JsonAsset = await getBgAniJson(true)
+        if (!bgAniJson) bgAniJson = await getBgAniJson(false)
         // 防止因异步加载json产生关卡显示错乱
         if (gameJson && getGameJson().includes(gameJson.name)) {
             let json = gameJson.json

assets/script/ui/gameMode/CoupleUI.ts

@@ -44,6 +44,18 @@ let posCfg = [
         [1, 1, 1, 1, 1, 1],
     ],
 ]
+let semeDifficultyCfg = {
+    0: 6, //没有学期时默认配置(posCfg排列数组的最大随机值)
+    200: 6, //没有学期时默认配置
+    231: 0,
+    232: 0,
+    341: 1,
+    342: 2,
+    451: 3,
+    452: 4,
+    561: 5,
+    562: 6,
+}
 @ccclass
 export class CoupleUI extends EndlessBaseGameUI {
     type: GAME_MODE = GAME_MODE.Couple
@@ -73,7 +85,7 @@ export class CoupleUI extends EndlessBaseGameUI {
         this.chooseNode.children.forEach(node => (node.active = true))
         layout.updateLayout()
         layout.enabled = false
-        let curPos = posCfg[Math.randomRangeInt(0, posCfg.length - 1)]
+        let curPos = posCfg[Math.randomRangeInt(0, semeDifficultyCfg[Data.game.semeID])]
         this.rules = []
         let showNum = 0
         curPos.forEach(value => {

assets/script/ui/gameMode/RaceUI.ts

@@ -14,13 +14,13 @@ const {ccclass, property} = cc._decorator
 let speedCfg = {
     0: [200], //没有学期时默认配置
     200: [200], //没有学期时默认配置
-    231: [100],
-    232: [100],
+    231: [60],
+    232: [80],
     341: [100],
-    342: [100],
-    451: [200],
-    452: [200],
-    561: [200],
+    342: [120],
+    451: [140],
+    452: [160],
+    561: [180],
     562: [200],
 }
 let enemyCfg = [0, 2, 2, 1, 1, 1]