更新

assets/scripts/games/scenes/PreloadingScene.ts

@@ -79,7 +79,7 @@ export class PreloadingScene extends Component {
     
     private initLocalData():void{
         // //清除本地数据
-        GameModel.single.ClearLocalData();
+        // GameModel.single.ClearLocalData();
         GameModel.single.ReadByLocal();
         SceneManager.single.Swicth("PrepareScene");
     }

assets/scripts/games/ui/dropBox/DropBoxMediator.ts

@@ -61,7 +61,7 @@ export class DropBoxMediator extends GUIMediator {
         if(this.type<0.5){
             this.gold=GameModel.single.fullEarnings*5*60;
             //五分钟收益
-            this.goldLabel.string=this.gold.toString();
+            this.goldLabel.string="X"+this.gold.toString();
             this.weaponState.active=false;
             this.goldState.active=true;
         }else{//枪

assets/scripts/games/ui/fightings/GameController.ts

@@ -318,7 +318,9 @@ export class GameController extends EventDispatcher{
             if(GameModel.single.currentLevel>=GameConfigManager.MaxLevel){
                 GameModel.single.currentLevel=GameConfigManager.MaxLevel;
             }
-            this.OnGameOver(0);
+            if(this.GameOver==false){
+                this.OnGameOver(0);
+            }
         }
     }
     
@@ -339,7 +341,11 @@ export class GameController extends EventDispatcher{
                 }
             }
         }else{
-            this.OnGameOver(1);
+            if(this.GameOver){
+                return;
+            }else{
+                this.OnGameOver(1);
+            }
         }
     }
 

assets/scripts/games/ui/prepares/WeaponCellListView.ts

@@ -200,7 +200,11 @@ export class WeaponCellListView extends BaseView{
             if(target==null){
                 //删除
                 if(this.HitNode(this.mediator.deleteWeaponNode,this.tempPos)){
-                    GameModel.single.RemoveWeapon(this.currentSelect.cellId);
+                    if(this.currentSelect==GameModel.single.currentWeaponCell){
+                        NoticeManager.ShowPrompt("不能销毁当前使用的武器！");
+                    }else{
+                        GameModel.single.RemoveWeapon(this.currentSelect.cellId);
+                    }
                 }else if(this.HitNode(this.mediator.equipWeaponNode,this.tempPos))
                 {//装配武器
                     GameModel.single.EquipWeapon(this.currentSelect);