8

src/pages/GamePage/GamePage.tsx

@@ -83,8 +83,6 @@ class GamePage extends React.Component<any, any> {
     })
     //退出游戏
     store.game.addGlobalEvent("exitGame", (e) => {
-      //自行切换，游戏有需要就销毁
-      store.game.destroy()
       PageCtrl.changePage(Homepage)
     })
     // store.game.addGlobalEvent("pauseGame", (e) => {

src/pages/mapPage/mappage.jsx

@@ -16,19 +16,11 @@ import { Button, Toast } from "@grace/ui";
 //研学地图页面+地图详情
 
 const cities = [
-  { spId: 'sp_landmark1', name: '北京', icon: '../src/assets/mapPage/icon_1.png', lock_icon: '../src/assets/mapPage/lock_icon_1.png' },
-  { spId: 'sp_landmark2', name: '西安', icon: '../src/assets/mapPage/icon_2.png', lock_icon: '../src/assets/mapPage/lock_icon_2.png' },
-  { spId: 'sp_landmark3', name: '上海', icon: '../src/assets/mapPage/icon_3.png', lock_icon: '../src/assets/mapPage/lock_icon_3.png' },
-  { spId: 'sp_landmark4', name: '杭州', icon: '../src/assets/mapPage/icon_4.png', lock_icon: '../src/assets/mapPage/lock_icon_4.png' },
-  { spId: 'sp_landmark5', name: '成都', icon: '../src/assets/mapPage/icon_5.png', lock_icon: '../src/assets/mapPage/lock_icon_5.png' }
-];
-
-const cities_info = [
-  { spId: 'sp_landmark1', name: '北京', icon: '../src/assets/mapPage/map_info_1.png' },
-  { spId: 'sp_landmark2', name: '西安', icon: '../src/assets/mapPage/map_info_2.png' },
-  { spId: 'sp_landmark3', name: '上海', icon: '../src/assets/mapPage/map_info_3.png' },
-  { spId: 'sp_landmark4', name: '杭州', icon: '../src/assets/mapPage/map_info_4.png' },
-  { spId: 'sp_landmark5', name: '成都', icon: '../src/assets/mapPage/map_info_5.png' }
+  { spId: 'sp_landmark1', name: '北京' },
+  { spId: 'sp_landmark2', name: '西安' },
+  { spId: 'sp_landmark3', name: '上海' },
+  { spId: 'sp_landmark4', name: '杭州' },
+  { spId: 'sp_landmark5', name: '成都' }
 ];
 
 @observer
@@ -129,7 +121,7 @@ class Mappage extends React.Component {
           <div className="city_box">
             {spInfoList.map((city, index) => (
               <div key={index} className="city_card">
-                <div className="city_icon" style={{ backgroundImage: `url(${city.unlockFlag ? cities.find(item => item.spId === city.spId).icon : cities.find(item => item.spId === city.spId).lock_icon})` }}>
+                <div className={city.unlockFlag ? "city_icon city_icon_" + city.spId : "city_icon city_icon_lock_" + city.spId}>
                 </div>
                 <div className="city_overlay">
                   <div className="city_name">{city.name}</div>

src/pages/mapPage/mappage.less

@@ -57,6 +57,37 @@
         align-items: center;
         justify-content: center;
       }
+      .city_icon_sp_landmark1{
+        .sparkBg("mapPage/icon_sp_landmark1.png");
+      }
+      .city_icon_sp_landmark2{
+        .sparkBg("mapPage/icon_sp_landmark2.png");
+      }
+      .city_icon_sp_landmark3{
+        .sparkBg("mapPage/icon_sp_landmark3.png");
+      }
+      .city_icon_sp_landmark4{
+        .sparkBg("mapPage/icon_sp_landmark4.png");
+      }
+      .city_icon_sp_landmark5{
+        .sparkBg("mapPage/icon_sp_landmark5.png");
+      }
+
+      .city_icon_lock_sp_landmark1{
+        .sparkBg("mapPage/lock_icon_sp_landmark1.png");
+      }
+      .city_icon_lock_sp_landmark2{
+        .sparkBg("mapPage/lock_icon_sp_landmark2.png");
+      }
+      .city_icon_lock_sp_landmark3{
+        .sparkBg("mapPage/lock_icon_sp_landmark3.png");
+      }
+      .city_icon_lock_sp_landmark4{
+        .sparkBg("mapPage/lock_icon_sp_landmark4.png");
+      }
+      .city_icon_lock_sp_landmark5{
+        .sparkBg("mapPage/lock_icon_sp_landmark5.png");
+      }
 
       .city_overlay {
         padding: 16px;

src/store/gameStore.ts

@@ -76,6 +76,7 @@ class GameStore {
     }
 
     if (suc) {
+      PageCtrl.changePage(HomePage);
       ModalCtrl.showModal(VictoryPopup, data);
     } else {
       ModalCtrl.showModal(FailPopup, { gameData: gameData, data: data });

src/store/store.ts

@@ -12,6 +12,7 @@ import { isWeiXin } from '@/AppTools.js';
 import { CHANNEL_PARAMS } from '@/utils/constants.js';
 import CodePop from "../components/CodePop/CodePop.jsx";
 import GiftPackPopup from '@/panels/GiftPackPopup/index.jsx'
+import { PageCtrl } from '@/core/ctrls/PageCtrl.js';
 
 class Store {