多语言换行

assets/60003/60003.scene

@@ -37000,7 +37000,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 50.4
+      "height": 37.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -37034,7 +37034,7 @@
     "_actualFontSize": 24,
     "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
     "_overflow": 3,
     "_enableWrapText": false,
     "_font": null,
@@ -37502,7 +37502,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 50.4
+      "height": 37.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -37536,7 +37536,7 @@
     "_actualFontSize": 24,
     "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
     "_overflow": 3,
     "_enableWrapText": false,
     "_font": null,
@@ -37896,7 +37896,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 50.4
+      "height": 37.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -37930,7 +37930,7 @@
     "_actualFontSize": 24,
     "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
     "_overflow": 3,
     "_enableWrapText": false,
     "_font": null,
@@ -38290,7 +38290,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 50.4
+      "height": 37.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -38324,7 +38324,7 @@
     "_actualFontSize": 24,
     "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
     "_overflow": 3,
     "_enableWrapText": false,
     "_font": null,
@@ -38684,7 +38684,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 50.4
+      "height": 37.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -38718,7 +38718,7 @@
     "_actualFontSize": 24,
     "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
     "_overflow": 3,
     "_enableWrapText": false,
     "_font": null,
@@ -39078,7 +39078,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 50.4
+      "height": 37.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -39112,7 +39112,7 @@
     "_actualFontSize": 24,
     "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
     "_overflow": 3,
     "_enableWrapText": false,
     "_font": null,

assets/60003/src/core/comp/GameConst60003.ts

@@ -143,4 +143,9 @@ export enum FreeGameType{
 	Free_8=2,
 	/**5次免费 */
 	Free_5=3,
+}
+
+
+export enum Game60003Sound{
+	bgm = "sound/bgm_normal",
 }

assets/60003/src/game/GameController60003.ts

@@ -1,10 +1,10 @@
 import { _decorator, Component, find, Node } from 'cc';
-import { I18CSVManager, Message, Network, Sleep, SocketConst, UILayerIndex, UIManager } from '../../sdk/API';
+import { AudioManager, I18CSVManager, Message, Network, Sleep, SocketConst, UILayerIndex, UIManager } from '../../sdk/API';
 import { GameEvent60003 } from '../core/comp/GameEvent60003';
 import { TipsMrg60003 } from './tips/TipsMrg60003';
 import { GameNetProxy60003 } from './GameNetProxy60003';
 import { UserData } from '../../sdk/GameVO';
-import { FortuneTigerType, FreeGameType, GamePrefab, ResultType } from '../core/comp/GameConst60003';
+import { FreeGameType, Game60003Sound, GamePrefab, ResultType } from '../core/comp/GameConst60003';
 import { RollManager60003 } from '../core/roll/RollManager60003';
 import { MinGameSpin60003 } from '../core/mrg/MinGameSpin60003';
 import { GameResultRewardMrg60003 } from '../core/mrg/GameResultRewardMrg60003';
@@ -35,6 +35,8 @@ export class GameController60003 extends Component {
     }
     protected onDestroy(): void {
         this._proxy.removeProxy();
+        this._proxy = null;
+        this._result = null;
         Message.remove(SocketConst.CONNECTED,this.reconnect, this);
         Message.remove(GameEvent60003.Player_Add_Bet,this.onPlayerAddBet,this)
         Message.remove(GameEvent60003.Player_Sub_Bet,this.onPlayerSubBet,this)
@@ -43,6 +45,7 @@ export class GameController60003 extends Component {
         GameController60003._ins=null
     }
     protected start(): void {
+        AudioManager.getInstance().playMusic(Game60003Sound.bgm)
 
         this._result=new GameResult60003()
         this._proxy.JoinTable()

assets/60003/src/game/item/GameSelectDateItem60003.ts

@@ -18,7 +18,8 @@ export class GameSelectDateItem60003 extends Component {
     }
 
     protected onEnable(): void {
-        if(this.index>=0) this.label.color = GameHistoryPanelUI60003.currSelectDate == this.index ? this.on : this.off;
+        // if(this.index>=0) this.label.color = GameHistoryPanelUI60003.currSelectDate == this.index ? this.on : this.off;
+        if(this.index>=0) this.label.color = this.on
     }
 
     start() {
@@ -32,7 +33,8 @@ export class GameSelectDateItem60003 extends Component {
     setData(str:string,index:number){
         this.label.string = str;
         this.index = index;
-        this.label.color = GameHistoryPanelUI60003.currSelectDate == this.index ? this.on : this.off;
+        // this.label.color = GameHistoryPanelUI60003.currSelectDate == this.index ? this.on : this.off;
+        this.label.color = this.on
     }
 
     private onClickBtn(){

assets/60003/src/game/ui/GenieEffect60003.ts

@@ -48,6 +48,7 @@ export class GenieEffect60003 extends Component {
     }
 
     protected onDestroy(): void {
+        GenieEffect60003._ins = null;
         Message.remove(GameEvent60003.Free_Game_Start,this.showEffect,this);
         Message.remove(GameEvent60003.Free_Game_End,this.clear,this);
     }