tjt 4 ماه پیش
والد
کامیت
ebff72e242
100فایلهای تغییر یافته به همراه7211 افزوده شده و 2849 حذف شده
  1. 7 3
      idiom/assets/core/util_class/PeriodData.ts
  2. 122 0
      idiom/assets/module_extra/table_json/level_2.json
  3. 1 0
      idiom/assets/module_extra/table_json/level_2.json.meta
  4. 24 0
      idiom/assets/module_extra/table_ts/table_level_2.ts
  5. 1 0
      idiom/assets/module_extra/table_ts/table_level_2.ts.meta
  6. 72 45
      idiom/assets/module_game/game/Container_Manager.ts
  7. 58 26
      idiom/assets/module_game/game/CreateIdiom.ts
  8. 4 4
      idiom/assets/module_game/game/GameCtl.ts
  9. 2 2
      idiom/assets/module_game/game/PlayerData.ts
  10. 1 1
      idiom/assets/module_game/game/cube1.prefab
  11. 1 1
      idiom/assets/module_game/game/cube2.prefab
  12. 1 1
      idiom/assets/module_game/game/cube3.prefab
  13. 139 170
      idiom/assets/module_game/game/game.scene
  14. 10 10
      idiom/assets/module_game/hall/Hall.ts
  15. 10 227
      idiom/assets/module_game/hall/hall.scene
  16. 1 1
      idiom/assets/module_game/materials/Container.mtl
  17. 2 1
      idiom/assets/module_game/materials/Lock.mtl
  18. 30 6
      idiom/assets/module_game/ui/UI/UI_Head_Icon.ts
  19. 19 19
      idiom/assets/module_game/ui/UI/UI_Item.ts
  20. 4 4
      idiom/assets/module_game/ui/UI_Hall/Hall.prefab
  21. 5 2
      idiom/assets/module_game/ui/UI_Hall/UI_Hall.ts
  22. 4 1
      idiom/assets/module_game/ui/UI_Idioms/ScrollView.prefab
  23. 33 17
      idiom/assets/module_game/ui/UI_Idioms/UI_Idioms.ts
  24. 128 326
      idiom/assets/module_game/ui/UI_Main/Main.prefab
  25. 5 5
      idiom/assets/module_game/ui/UI_Main/UI_Main.ts
  26. 354 293
      idiom/assets/module_game/ui/UI_Rank/Rank.prefab
  27. 1 1
      idiom/assets/module_game/ui/UI_Rank/UI_Rank.ts
  28. 351 186
      idiom/assets/module_game/ui/UI_Rank/UI_Rank_Item.prefab
  29. 2 0
      idiom/assets/module_game/ui/UI_Settings/Layout_Settings.ts
  30. 355 12
      idiom/assets/module_game/ui/UI_Settings/Settings.prefab
  31. 9 0
      idiom/assets/module_game/ui/UI_Settings/UI_Settings.ts
  32. 255 240
      idiom/assets/module_game/ui/UI_Sign/Sign.prefab
  33. 276 137
      idiom/assets/module_game/ui/UI_Store/Store.prefab
  34. 4 2
      idiom/assets/module_game/ui/UI_Store/UI_Store.ts
  35. 350 163
      idiom/assets/module_game/ui/UI_Task/Task.prefab
  36. 1 1
      idiom/assets/module_game/ui/UI_Task/UI_Task.ts
  37. 1 1
      idiom/assets/module_game/ui/UI_Task/UI_Task_Item.ts
  38. 9 0
      idiom/assets/module_game/ui/UI_Tips.meta
  39. 1720 0
      idiom/assets/module_game/ui/UI_Tips/Tips.prefab
  40. 13 0
      idiom/assets/module_game/ui/UI_Tips/Tips.prefab.meta
  41. 9 0
      idiom/assets/res/Texture.meta
  42. 0 0
      idiom/assets/res/Texture/存放@2x.png
  43. 0 0
      idiom/assets/res/Texture/存放@2x.png.meta
  44. 0 0
      idiom/assets/res/Texture/组11@2x.png
  45. 0 0
      idiom/assets/res/Texture/组11@2x.png.meta
  46. 1 1
      idiom/assets/res/侧边栏/SideBar.pac.meta
  47. 0 0
      idiom/assets/res/加载页/Bar.png
  48. 134 0
      idiom/assets/res/加载页/Bar.png.meta
  49. 1 1
      idiom/assets/res/加载页/Loading.pac.meta
  50. 0 0
      idiom/assets/res/加载页/LoadingBar_Bg.png
  51. 134 0
      idiom/assets/res/加载页/LoadingBar_Bg.png.meta
  52. BIN
      idiom/assets/res/加载页/大背景@2x.png
  53. 0 134
      idiom/assets/res/加载页/大背景@2x.png.meta
  54. 0 0
      idiom/assets/res/加载页/新建文件夹/Bg.jpg
  55. 134 0
      idiom/assets/res/加载页/新建文件夹/Bg.jpg.meta
  56. 0 134
      idiom/assets/res/加载页/新建文件夹/beijing_07@2x.jpg.meta
  57. BIN
      idiom/assets/res/加载页/新建文件夹/cyxlx.png
  58. 134 0
      idiom/assets/res/加载页/新建文件夹/cyxlx.png.meta
  59. BIN
      idiom/assets/res/加载页/新建文件夹/cyxlx_Healthy.png
  60. 134 0
      idiom/assets/res/加载页/新建文件夹/cyxlx_Healthy.png.meta
  61. 0 0
      idiom/assets/res/加载页/新建文件夹/kndlh.png
  62. 134 0
      idiom/assets/res/加载页/新建文件夹/kndlh.png.meta
  63. BIN
      idiom/assets/res/加载页/新建文件夹/kndlh_Heality.png
  64. 134 0
      idiom/assets/res/加载页/新建文件夹/kndlh_Heality.png.meta
  65. 0 134
      idiom/assets/res/加载页/新建文件夹/标题@2x.png.meta
  66. 0 134
      idiom/assets/res/加载页/矩形1@2x.png.meta
  67. 0 134
      idiom/assets/res/加载页/矩形1拷贝@2x.png.meta
  68. BIN
      idiom/assets/res/加载页/组19@2x.png
  69. 0 134
      idiom/assets/res/加载页/组19@2x.png.meta
  70. 0 134
      idiom/assets/res/商城/96bc665b03b6475706153389ebd263b93c96010ece6-xqd2Y1@2x.png.meta
  71. 0 0
      idiom/assets/res/商城/Ad_Logo.png
  72. 134 0
      idiom/assets/res/商城/Ad_Logo.png.meta
  73. 0 0
      idiom/assets/res/商城/AddTime_Des.png
  74. 134 0
      idiom/assets/res/商城/AddTime_Des.png.meta
  75. 0 0
      idiom/assets/res/商城/Bg.png
  76. 134 0
      idiom/assets/res/商城/Bg.png.meta
  77. 0 0
      idiom/assets/res/商城/Close.png
  78. 134 0
      idiom/assets/res/商城/Close.png.meta
  79. 0 0
      idiom/assets/res/商城/CoinGet_Bg.png
  80. 134 0
      idiom/assets/res/商城/CoinGet_Bg.png.meta
  81. 0 0
      idiom/assets/res/商城/Coin_Des.png
  82. 134 0
      idiom/assets/res/商城/Coin_Des.png.meta
  83. 0 0
      idiom/assets/res/商城/Eliminate_Des.png
  84. 134 0
      idiom/assets/res/商城/Eliminate_Des.png.meta
  85. 0 0
      idiom/assets/res/商城/Empty_Des.png
  86. 134 0
      idiom/assets/res/商城/Empty_Des.png.meta
  87. 0 0
      idiom/assets/res/商城/Frame.png
  88. 134 0
      idiom/assets/res/商城/Frame.png.meta
  89. 0 0
      idiom/assets/res/商城/Free.png
  90. 134 0
      idiom/assets/res/商城/Free.png.meta
  91. 0 0
      idiom/assets/res/商城/Free_Bg.png
  92. 134 0
      idiom/assets/res/商城/Free_Bg.png.meta
  93. 0 0
      idiom/assets/res/商城/Line.png
  94. 134 0
      idiom/assets/res/商城/Line.png.meta
  95. 0 0
      idiom/assets/res/商城/Shuffle_Des.png
  96. 134 0
      idiom/assets/res/商城/Shuffle_Des.png.meta
  97. 1 1
      idiom/assets/res/商城/Store.pac.meta
  98. 0 0
      idiom/assets/res/商城/Title.png
  99. 134 0
      idiom/assets/res/商城/Title.png.meta
  100. 0 0
      idiom/assets/res/商城/TitleBg.png

+ 7 - 3
idiom/assets/core/util_class/PeriodData.ts

@@ -28,7 +28,7 @@ day_data.get(day_type.score)...
 */
 export default class PeriodData<T extends string | number | symbol> {
    private _data: Map<T, { v: number, min: number | null, max: number | null }> = new Map();
-   private _data_Array: Map<T, any> = new Map();
+   private _data_Array: Map<T, boolean[]> = new Map();
    private _last: number = 0;
    private _update: PeriodDataUpdate;
    constructor(update: PeriodDataUpdate, limt?: Map<T, { min?: number | null, max?: number | null }>) {
@@ -86,8 +86,9 @@ export default class PeriodData<T extends string | number | symbol> {
       return data;
    }
 
-   private _get_Array(key: T): any {
+   private _get_Array(key: T): boolean[] {
       let data = this._data_Array.get(key);
+      console.log(`_get_Array called with key: `+String(key)+ `data:`, data);  // 输出存储的数据
       if (!data) {
          data = new Array(5).fill(false);
          this._data_Array.set(key, data);
@@ -111,7 +112,7 @@ export default class PeriodData<T extends string | number | symbol> {
       this._data_Array.set(key, value);
    }
    /**获取数据*/
-   get_Array(key: T): any {
+   get_Array(key: T): boolean[] {
       return this._get_Array(key);
    }
 
@@ -205,6 +206,9 @@ export default class PeriodData<T extends string | number | symbol> {
          const data = this._get(key);
          data.v = data.min ?? 0;
       }
+      for(const key of this._data_Array.keys()){
+         this._data_Array.set(key,new Array(5).fill(false));
+      }
    }
    /**判定两个时间是否是同一天*/
    private isSameDate(timestamp1: number, timestamp2: number): boolean {

+ 122 - 0
idiom/assets/module_extra/table_json/level_2.json

@@ -0,0 +1,122 @@
+{
+    "0": {
+        "idiom": "一马当先"
+    },
+    "1": {
+        "idiom": "一见如故"
+    },
+    "2": {
+        "idiom": "一本正经"
+    },
+    "3": {
+        "idiom": "一望无际"
+    },
+    "4": {
+        "idiom": "一鼓作气"
+    },
+    "5": {
+        "idiom": "万紫千红"
+    },
+    "6": {
+        "idiom": "万事如意"
+    },
+    "7": {
+        "idiom": "万家灯火"
+    },
+    "8": {
+        "idiom": "万无一失"
+    },
+    "9": {
+        "idiom": "万箭穿心"
+    },
+    "10": {
+        "idiom": "三心二意"
+    },
+    "11": {
+        "idiom": "三生有幸"
+    },
+    "12": {
+        "idiom": "三顾茅庐"
+    },
+    "13": {
+        "idiom": "三寸金莲"
+    },
+    "14": {
+        "idiom": "三更半夜"
+    },
+    "15": {
+        "idiom": "不修边幅"
+    },
+    "16": {
+        "idiom": "不共戴天"
+    },
+    "17": {
+        "idiom": "不动声色"
+    },
+    "18": {
+        "idiom": "不劳而获"
+    },
+    "19": {
+        "idiom": "不可理喻"
+    },
+    "20": {
+        "idiom": "人面兽心"
+    },
+    "21": {
+        "idiom": "人命关天"
+    },
+    "22": {
+        "idiom": "人之常情"
+    },
+    "23": {
+        "idiom": "人情冷暖"
+    },
+    "24": {
+        "idiom": "人微言轻"
+    },
+    "25": {
+        "idiom": "从善如流"
+    },
+    "26": {
+        "idiom": "从一而终"
+    },
+    "27": {
+        "idiom": "从天而降"
+    },
+    "28": {
+        "idiom": "从容不迫"
+    },
+    "29": {
+        "idiom": "从长计议"
+    },
+    "30": {
+        "idiom": "轰轰烈烈"
+    },
+    "31": {
+        "idiom": "兢兢业业"
+    },
+    "32": {
+        "idiom": "大大方方"
+    },
+    "33": {
+        "idiom": "心心念念"
+    },
+    "34": {
+        "idiom": "恩恩爱爱"
+    },
+    "35": {
+        "idiom": "安安静静"
+    },
+    "36": {
+        "idiom": "口口声声"
+    },
+    "37": {
+        "idiom": "生生世世"
+    },
+    "38": {
+        "idiom": "堂堂正正"
+    },
+    "39": {
+        "idiom": "吞吞吐吐"
+    }
+}

+ 1 - 0
idiom/assets/module_extra/table_json/level_2.json.meta

@@ -0,0 +1 @@
+{"ver":"2.0.1","importer":"json","imported":true,"uuid":"61728f81-9ac8-4436-a78d-597687cadbc1","files":[".json"],"subMetas":{},"userData":{}}

+ 24 - 0
idiom/assets/module_extra/table_ts/table_level_2.ts

@@ -0,0 +1,24 @@
+import { _decorator, Component, Node } from 'cc';
+import { TableUtil } from './TableUtil';
+const { ccclass, property } = _decorator;
+
+@ccclass('table_level_2')
+export class table_level_2 {
+    static readonly TableName: string = "level_2";
+
+    static get(id: number): table_level_2 { return TableUtil.getTable(table_level_2, id) };
+    static getList(): table_level_2[] { return TableUtil.getTables(table_level_2,40) };
+    private data: any;
+
+    init(id: number) {
+        var table = TableUtil.get(table_level_2.TableName);
+        this.data = table[id];
+        if (!this.data) console.error("配置表" + table_level_2.TableName + "没有ID:" + id);
+        this.id = id;
+    }
+    /** 编号【KEY】 */
+    id: number = 0;
+    get idiom():string { return this.data.idiom; }
+}
+
+

+ 1 - 0
idiom/assets/module_extra/table_ts/table_level_2.ts.meta

@@ -0,0 +1 @@
+{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"2983a28f-3857-405a-8f35-34d0de9a52ca","files":[],"subMetas":{},"userData":{}}

+ 72 - 45
idiom/assets/module_game/game/Container_Manager.ts

@@ -15,6 +15,8 @@ import { table_idiom_order } from '../../module_extra/table_ts/table_idiom_order
 import { table_idiom_unorder_1_3 } from '../../module_extra/table_ts/table_idiom_unorder_1_3';
 import { table_idiom_unorder_2_2 } from '../../module_extra/table_ts/table_idiom_unorder_2_2';
 import { table_idiom_unorder_3_1 } from '../../module_extra/table_ts/table_idiom_unorder_3_1';
+import { table_level_2 } from '../../module_extra/table_ts/table_level_2';
+import ArrayUtil from '../../core/util/ArrayUtil';
 
 const { ccclass, property } = _decorator;
 
@@ -29,11 +31,12 @@ export class Container_Manager extends Component {
     prefabs: Prefab[] = [];
 
     level_config: any = null;//关卡配置
+    level2_config: any = null;//第二关配置
 
     config: any = null;//有规律的成语库
-    config_1_3:any=null;//无规律1+3
-    config_2_2:any=null;//无规律2+2
-    config_3_1:any=null;//无规律3+1
+    config_1_3: any = null;//无规律1+3
+    config_2_2: any = null;//无规律2+2
+    config_3_1: any = null;//无规律3+1
 
     idioms: any[] = [];//生成的成语
     index: number[] = [];//生成的成语角标,避免生成重复成语
@@ -48,7 +51,7 @@ export class Container_Manager extends Component {
 
     unlock_Num: number = 7;
 
-    is_Show_UI_Lock=false;
+    is_Show_UI_Lock = false;
 
     idiom_combine: Map<Cube_Infor, number> = new Map();
 
@@ -74,6 +77,8 @@ export class Container_Manager extends Component {
             console.log("生成第" + i + "个节点:" + newCube.getComponent(Cube_Infor).Text);
             this.Cube_Pool.put(newCube);
         }
+
+        this.shufflePool();
     }
 
     public getCube(): Node {
@@ -101,7 +106,7 @@ export class Container_Manager extends Component {
     start() {
         this.config = table_idiom_order.getList();
 
-        this.config_1_3=table_idiom_unorder_1_3.getList();
+        this.config_1_3 = table_idiom_unorder_1_3.getList();
 
         this.config_2_2 = table_idiom_unorder_2_2.getList();
 
@@ -112,6 +117,8 @@ export class Container_Manager extends Component {
         console.log(this.config_3_1.length);
 
         this.level_config = table_level.getList();
+
+        this.level2_config = table_level_2.getList();
         // if (this.level_config.length === 5) {
         //     console.log("关卡配置导入成功");
         // }
@@ -169,39 +176,60 @@ export class Container_Manager extends Component {
         this.Lock_node.forEach(node => {
             node.active = true;
         });
-        this.unlock_Num=7;
-        this.is_Show_UI_Lock=false;
-        this.canTouch=false;
+        this.unlock_Num = 7;
+        this.is_Show_UI_Lock = false;
+        this.canTouch = false;
         let level = Hall.getInstance().player.get_max_floor();
+        for(let i = 0;i<this.nodeReferences.length;i++){
+            if(this.nodeReferences[i])
+            this.nodeReferences[i].destroy();
+        }
         this.clearCubePool();
-
-        if (level === 0) {
-            let str2: string = this.level_config[level].idiom_type_2;
-            let idiom_type_2 = str2.split("_");
-            console.log("idiom_type_2:", idiom_type_2);
-
-            let selectedIdioms: Record<string, any[]> = {};
-
-            [...idiom_type_2].forEach(rule => {
-                let filteredIdioms = this.config.filter(item => item.piece_2_word === rule);
-                console.log(`筛选2 ${rule} 后的成语:`, filteredIdioms);
-
-                selectedIdioms[rule] = filteredIdioms;
-            });
-
-            for (let rule in selectedIdioms) {
-                if (selectedIdioms.hasOwnProperty(rule)) {
-                    this.idioms.push(...selectedIdioms[rule]);
-                }
-            }
-
-            console.log("最终选中的成语:", this.idioms);
-        }else if(level===1)
+        this.idioms = [];
+        this.nodeReferences=[];
+        this.node_isIdiom=new Array(9).fill(false);
+        this.idiom_combine=new Map();
+
+        // if (level === 0) {
+        //     let str2: string = this.level_config[level].idiom_type_2;
+        //     let idiom_type_2 = str2.split("_");
+        //     console.log("idiom_type_2:", idiom_type_2);
+
+        //     let selectedIdioms: Record<string, any[]> = {};
+
+        //     [...idiom_type_2].forEach(rule => {
+        //         let filteredIdioms = this.config.filter(item => item.piece_2_word === rule);
+                
+        //         if (filteredIdioms.length === 0) {
+        //             filteredIdioms = this.config_2_2.filter(item => item.piece_2_word === rule);
+        //         }
+        //         console.log(`筛选2 ${rule} 后的成语:`, filteredIdioms);
+        //         selectedIdioms[rule] = filteredIdioms;
+        //     });
+
+        //     for (let rule in selectedIdioms) {
+        //         if (selectedIdioms.hasOwnProperty(rule)) {
+        //             this.idioms.push(...selectedIdioms[rule]);
+        //         }
+        //     }
+
+        //     console.log("最终选中的成语:", this.idioms);
+        // } else if (level === 1) {
+        //     for (let i = 0; i < 30; i++) {
+        //         let filteredIdiom = this.config.filter(item => item.idiom == this.level2_config[i].idiom);
+        //         this.idioms.push(...filteredIdiom);
+        //     }
+        //     for (let i = 30; i < 40; i++) {
+        //         let filteredIdiom = this.config_2_2.filter(item => item.idiom == this.level2_config[i].idiom);
+        //         this.idioms.push(...filteredIdiom);
+        //     }
+        // }
         {
-
-        }
-        else {
             // 获取当前层级的筛选条件
+            if(level==0||level==1)
+            {
+                level=2;
+            }
             let str1: string = this.level_config[level].idiom_type_1;
             let idiom_type_1 = str1.split("_"); // 分割成数组
             console.log("idiom_type_1:", idiom_type_1);
@@ -209,7 +237,7 @@ export class Container_Manager extends Component {
             let idiom_type_2 = str2.split("_"); // 分割成数组
             console.log("idiom_type_2:", idiom_type_2);
 
-            let count = this.level_config[level].count/(idiom_type_1.length+idiom_type_2.length);
+            let count = this.level_config[level].count / (idiom_type_1.length + idiom_type_2.length);
 
             // 初始化保存结果的数组
             let selectedIdioms: Record<string, any[]> = {};
@@ -274,7 +302,7 @@ export class Container_Manager extends Component {
             }
 
             //
-            if(this.level_config[level].easy_1_3>0){
+            if (this.level_config[level].easy_1_3 > 0) {
                 let filteredIdioms = this.config_1_3.filter(item => item.difficulty === "easy");
                 for (let i = 0; i < this.level_config[level].easy_1_3; i++) {
                     let rand = ch_util.getRandomInt(0, filteredIdioms.length - 1);
@@ -284,7 +312,7 @@ export class Container_Manager extends Component {
                 }
             }
 
-            if(this.level_config[level].hard_1_3>0){
+            if (this.level_config[level].hard_1_3 > 0) {
                 let filteredIdioms = this.config_1_3.filter(item => item.difficulty === "hard");
                 for (let i = 0; i < this.level_config[level].hard_1_3; i++) {
                     let rand = ch_util.getRandomInt(0, filteredIdioms.length - 1);
@@ -294,7 +322,7 @@ export class Container_Manager extends Component {
                 }
             }
 
-            if(this.level_config[level].easy_2_2>0){
+            if (this.level_config[level].easy_2_2 > 0) {
                 let filteredIdioms = this.config_2_2.filter(item => item.difficulty === "easy");
                 for (let i = 0; i < this.level_config[level].easy_2_2; i++) {
                     let rand = ch_util.getRandomInt(0, filteredIdioms.length - 1);
@@ -304,7 +332,7 @@ export class Container_Manager extends Component {
                 }
             }
 
-            if(this.level_config[level].hard_2_2>0){
+            if (this.level_config[level].hard_2_2 > 0) {
                 let filteredIdioms = this.config_2_2.filter(item => item.difficulty === "hard");
                 for (let i = 0; i < this.level_config[level].hard_2_2; i++) {
                     let rand = ch_util.getRandomInt(0, filteredIdioms.length - 1);
@@ -314,7 +342,7 @@ export class Container_Manager extends Component {
                 }
             }
 
-            if(this.level_config[level].easy_3_1>0){
+            if (this.level_config[level].easy_3_1 > 0) {
                 let filteredIdioms = this.config_3_1.filter(item => item.difficulty === "easy");
                 for (let i = 0; i < this.level_config[level].easy_3_1; i++) {
                     let rand = ch_util.getRandomInt(0, filteredIdioms.length - 1);
@@ -324,7 +352,7 @@ export class Container_Manager extends Component {
                 }
             }
 
-            if(this.level_config[level].hard_1_3>0){
+            if (this.level_config[level].hard_1_3 > 0) {
                 let filteredIdioms = this.config_1_3.filter(item => item.difficulty === "hard");
                 for (let i = 0; i < this.level_config[level].hard_1_3; i++) {
                     let rand = ch_util.getRandomInt(0, filteredIdioms.length - 1);
@@ -338,7 +366,6 @@ export class Container_Manager extends Component {
         }
         this.count = this.level_config[level].total;
 
-
         await this.instantiateCube();
         await gui.show(UI_Idioms);
         await this.create_node.nodeMoving();
@@ -476,9 +503,9 @@ export class Container_Manager extends Component {
         gui.get(UI_Idioms).all_light_Hide();
     }
 
-    AddTime(){
-        const layout=gui.get(UI_Main).getLayout<Layout_Main>();
-        layout.time+=3;
+    AddTime() {
+        const layout = gui.get(UI_Main).getLayout<Layout_Main>();
+        layout.time += 120;
     }
 
     private shufflePool() {

+ 58 - 26
idiom/assets/module_game/game/CreateIdiom.ts

@@ -1,6 +1,8 @@
 import { _decorator, Component, debug, director, find, instantiate, Layers, Node, NodePool, Prefab, tween, Vec3 } from 'cc';
 import { Cube_Infor, Cube_State } from './Cube_Infor';
 import { Container_Manager } from './Container_Manager';
+import { gui } from '../../core/ui/ui';
+import { UI_Main } from '../ui/UI_Main/UI_Main';
 const { ccclass, property } = _decorator;
 
 @ccclass('CreateIdiom')
@@ -17,55 +19,85 @@ export class CreateIdiom extends Component {
     }
 
     nodeMoving() {
-        this.node.setPosition(new Vec3(0,1.6,0));
+        this.node.setPosition(new Vec3(0, 1.6, 0));
 
         let startPos = this.node.position; // 起点,抛物线开始的坐标
-        let middlePos = new Vec3(this.node.position.x, this.node.position.y+1, 0); // 中间控制点
-        let destPos = new Vec3(this.node.position.x, this.node.position.y+2, 0); // 终点,抛物线上升顶点
+        let middlePos = new Vec3(this.node.position.x, this.node.position.y + 2, 0); // 中间控制点
+        let destPos = new Vec3(this.node.position.x, this.node.position.y + 4, 0); // 终点,抛物线上升顶点
 
+        // 保持原来贝塞尔曲线和螺旋效果的计算
         let twoBezier = (t: number, p1: Vec3, cp: Vec3, p2: Vec3) => {
             // 贝塞尔曲线计算
             let x = (1 - t) * (1 - t) * p1.x + 2 * t * (1 - t) * cp.x + t * t * p2.x;
             let y = (1 - t) * (1 - t) * p1.y + 2 * t * (1 - t) * cp.y + t * t * p2.y;
+            let z = (1 - t) * (1 - t) * p1.z + 2 * t * (1 - t) * cp.z + t * t * p2.z;
 
             // 螺旋运动计算
             let angle = t * Math.PI * 6; // 螺旋角度变化,增加圈数
-            let radius = 1.0 + t * 1.5; // 螺旋半径逐渐增大
+            let radius = t * 3.5; // 螺旋半径逐渐增大
             let xOffset = Math.cos(angle) * radius; // x 轴偏移
             let zOffset = Math.sin(angle) * radius; // z 轴偏移
 
             // 返回最终点,带有螺旋效果
-            return new Vec3(x + xOffset, y, zOffset);
+            return new Vec3(x + xOffset, y, z + zOffset);
         };
 
-
-        let tweenDuration: number = 2.0; // 动画时长
         let createdNodes = 0; // 已生成的节点计数
+        let animationStopped = false; // 控制动画是否已经停止
+
+        let t = 0; // 进度 t,0 为起点,1 为终点
+
+        const updatePosition = () => {
+            if (animationStopped) return; // 如果动画已停止,则不继续执行
+
+            // 继续使用贝塞尔曲线计算,带螺旋效果
+            this.node.position = twoBezier(t, startPos, middlePos, destPos);
+
+            // 根据进度生成新节点
+            let cube = this.Container.getCube();
+            if (cube != null && cube.getComponent(Cube_Infor).state === Cube_State.live) {
+                let newNode = cube;
+                newNode.parent = director.getScene();
+                newNode.setPosition(this.node.position);
+                this.Container.nodeReferences.push(newNode);
+                console.log(cube.getComponent(Cube_Infor).Text);
+                createdNodes++; // 记录生成的方块
+            }
+
+            // 如果没有方块,停止动画
+            if (cube == null && !animationStopped) {
+                animationStopped = true; // 设置动画停止标志
+                console.log("没有方块,停止动画");
+                this.node.setPosition(this.node.position); // 防止继续更新位置
+            }
+
+            // 获取 Container 中的当前方块数量
+            let totalCubes = this.Container.idioms.length * 2; // 假设 idioms 存储了所有方块的信息
+
+            // 如果所有方块都已生成,停止动画
+            if (createdNodes >= totalCubes) {
+                animationStopped = true;
+                this.Container.canTouch = true;
+                console.log("所有方块已拿完,停止动画");
+            }
+
+            // 更新 t 和重新调用动画
+            if (t < 1) {
+                t += 0.01; // 每次更新进度
+                requestAnimationFrame(updatePosition); // 使用 requestAnimationFrame 来继续更新位置
+            }
+        };
 
-        tween(this.node.position)
-            .to(tweenDuration, destPos, {
-                onUpdate: (target: Vec3, ratio: number) => {
-                    // 计算新的位置,带螺旋上升效果
-                    this.node.position = twoBezier(ratio, startPos, middlePos, destPos);
-
-                    // 根据进度生成新节点
-                    let cube =this.Container.getCube();
-                    if (cube != null&&cube.getComponent(Cube_Infor).state === Cube_State.live) {
-                        let newNode = cube;
-                        newNode.parent = director.getScene();
-                        newNode.setPosition(this.node.position);
-                        this.Container.nodeReferences.push(newNode);
-                        console.log(cube.getComponent(Cube_Infor).Text);
-                    }
-                }
-            }).call(()=>{
-                this.Container.canTouch=true;
-            }).start();
+        // 启动动画
+        updatePosition();
     }
 
 
 
 
+
+
+
 }
 
 

+ 4 - 4
idiom/assets/module_game/game/GameCtl.ts

@@ -65,10 +65,10 @@ export class GameCtl extends Component {
 
             //当前其余点击无效
             if (collider.node.getComponent(Cube_Infor)?.state === Cube_State.live) {
-                if(gui.get(UI_Main).getLayout<Layout_Main>().Hand.active==true)
-                {
-                    gui.get(UI_Main).getLayout<Layout_Main>().Hand.active=false;
-                }
+                // if(gui.get(UI_Main).getLayout<Layout_Main>().Hand.active==true)
+                // {
+                //     gui.get(UI_Main).getLayout<Layout_Main>().Hand.active=false;
+                // }
                 this.entryContainer(collider.node);
             } else if (collider.node.name == 'Lock') {
                 //解锁槽子

+ 2 - 2
idiom/assets/module_game/game/PlayerData.ts

@@ -239,7 +239,7 @@ export default class PlayerData extends GameData<data_type, day_data_type, week_
     }
 
     //获取任务奖励状态
-    public get_task_state(): number {
+    public get_task_state() {
         return this.day_data.get_Array(day_data_type.task_reward_state);
     }
 
@@ -250,7 +250,7 @@ export default class PlayerData extends GameData<data_type, day_data_type, week_
     }
 
     //获取商店免费领取状态
-    public get_store_state(): number {
+    public get_store_state() {
         return this.day_data.get_Array(day_data_type.store_state);
     }
 

+ 1 - 1
idiom/assets/module_game/game/cube1.prefab

@@ -57,7 +57,7 @@
       "__type__": "cc.Vec3",
       "x": 2.3,
       "y": 2,
-      "z": 2
+      "z": 2.2
     },
     "_mobility": 0,
     "_layer": 1,

+ 1 - 1
idiom/assets/module_game/game/cube2.prefab

@@ -57,7 +57,7 @@
       "__type__": "cc.Vec3",
       "x": 2.2,
       "y": 2,
-      "z": 2
+      "z": 2.2
     },
     "_mobility": 0,
     "_layer": 1,

+ 1 - 1
idiom/assets/module_game/game/cube3.prefab

@@ -57,7 +57,7 @@
       "__type__": "cc.Vec3",
       "x": 2.3,
       "y": 2,
-      "z": 2
+      "z": 2.2
     },
     "_mobility": 0,
     "_layer": 1,

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 139 - 170
idiom/assets/module_game/game/game.scene


+ 10 - 10
idiom/assets/module_game/hall/Hall.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, director, Node } from 'cc';
+import { _decorator, Component, director, Node, profiler } from 'cc';
 import { ch } from '../../ch/ch';
 import { gui } from '../../core/ui/ui';
 import get_new_head_icon from '../../core/util_class/HeadIcon';
@@ -13,33 +13,33 @@ const { ccclass, property } = _decorator;
 @ccclass('Hall')
 export class Hall extends Component {
     private static instance: Hall;
-    public player:PlayerData;
-    public head_icon=get_new_head_icon();
+    public player: PlayerData;
+    public head_icon = get_new_head_icon();
 
-    public static getInstance():Hall{
+    public static getInstance(): Hall {
         return Hall.instance;
     }
 
     async start() {
-        if(!Hall.instance){
-            Hall.instance=this;
+        if (!Hall.instance) {
+            Hall.instance = this;
         }
+        this.init();
         gui.show(UI_Hall);
         director.addPersistRootNode(this.node);
-        this.init();
         // if(chsdk.checkFromSidebar())
         // {
         //     Hall.getInstance().player.add_item(2,2);
         // }
     }
 
-    async init(){
+    async init() {
         this.loadTable();
         this.player = PlayerData.getInstance(ch.sdk.get_gid(), ch.sdk.get_uid().toString());
         this.player.init_user_info();
         await this.player.load();
         this.player.set_login_num(1);
-        console.log("登录次数:"+this.player.get_login_num());
+        console.log("登录次数:" + this.player.get_login_num());
 
     }
 
@@ -47,7 +47,7 @@ export class Hall extends Component {
     private loadTable(): void {
         ch.log.log_start("加载配置初始化");
         TableLoadUtil.preloadAll(ModuleDef.EXTRA, "table_json", async () => {
-            
+
         }, TableUtil.set);
     }
 }

+ 10 - 227
idiom/assets/module_game/hall/hall.scene

@@ -18,15 +18,12 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 4
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 10
+      "__id__": 4
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -57,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 11
+      "__id__": 5
     },
     "_id": "f9516261-6f5e-4b79-9676-880b100e9a8d"
   },
@@ -119,220 +116,6 @@
     "_id": "0eV11xOKlOda2JyjurLLAc"
   },
   {
-    "__type__": "cc.Node",
-    "_name": "Canvas",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 5
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      }
-    ],
-    "_prefab": null,
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 375,
-      "y": 817,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": "32omeLI4FE56w2tOxqnjbd"
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Camera",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 4
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 6
-      }
-    ],
-    "_prefab": null,
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 1000
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": "8b67eTpbpKP6KBUNbl9sqf"
-  },
-  {
-    "__type__": "cc.Camera",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 5
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_projection": 0,
-    "_priority": 1073741824,
-    "_fov": 45,
-    "_fovAxis": 0,
-    "_orthoHeight": 817,
-    "_near": 1,
-    "_far": 2000,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_depth": 1,
-    "_stencil": 0,
-    "_clearFlags": 6,
-    "_rect": {
-      "__type__": "cc.Rect",
-      "x": 0,
-      "y": 0,
-      "width": 1,
-      "height": 1
-    },
-    "_aperture": 19,
-    "_shutter": 7,
-    "_iso": 0,
-    "_screenScale": 1,
-    "_visibility": 41943040,
-    "_targetTexture": null,
-    "_postProcess": null,
-    "_usePostProcess": false,
-    "_cameraType": -1,
-    "_trackingType": 0,
-    "_id": "41i1U8olhKxonTx0gu58rM"
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 4
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 750,
-      "height": 1634
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": "43ixderMdJDpn10iK6EuGE"
-  },
-  {
-    "__type__": "cc.Canvas",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 4
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_cameraComponent": {
-      "__id__": 6
-    },
-    "_alignCanvasWithScreen": true,
-    "_id": "bfbV7244lGsYKo25S9bSR4"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 4
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": "1218Ip309HLIiv05EUds6p"
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": null,
     "asset": null,
@@ -343,28 +126,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 12
+      "__id__": 6
     },
     "shadows": {
-      "__id__": 13
+      "__id__": 7
     },
     "_skybox": {
-      "__id__": 14
+      "__id__": 8
     },
     "fog": {
-      "__id__": 15
+      "__id__": 9
     },
     "octree": {
-      "__id__": 16
+      "__id__": 10
     },
     "skin": {
-      "__id__": 17
+      "__id__": 11
     },
     "lightProbeInfo": {
-      "__id__": 18
+      "__id__": 12
     },
     "postSettings": {
-      "__id__": 19
+      "__id__": 13
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

+ 1 - 1
idiom/assets/module_game/materials/Container.mtl

@@ -8,7 +8,7 @@
     "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
     "__expectedType__": "cc.EffectAsset"
   },
-  "_techIdx": 1,
+  "_techIdx": 0,
   "_defines": [
     {
       "USE_TEXTURE": true

+ 2 - 1
idiom/assets/module_game/materials/Lock.mtl

@@ -8,9 +8,10 @@
     "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
     "__expectedType__": "cc.EffectAsset"
   },
-  "_techIdx": 1,
+  "_techIdx": 0,
   "_defines": [
     {
+      "USE_INSTANCING": true,
       "USE_TEXTURE": true
     },
     {},

+ 30 - 6
idiom/assets/module_game/ui/UI/UI_Head_Icon.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node, Sprite, SpriteFrame } from 'cc';
+import { _decorator, Component, Node, Size, Sprite, SpriteFrame, UITransform, Vec2 } from 'cc';
 import { Hall } from '../../hall/Hall';
 import { ch } from 'db://assets/ch/ch';
 
@@ -7,21 +7,45 @@ const { ccclass, property } = _decorator;
 @ccclass('UI_Head_Icon')
 export class UI_Head_Icon extends Component {
     @property(Sprite)
-    private head:Sprite;
+    private head: Sprite;
     @property([SpriteFrame])
-    private default_head:SpriteFrame[] = [];
+    private default_head: SpriteFrame[] = [];
 
     start() {
 
     }
 
     update(deltaTime: number) {
+
+    }
+
+    show(uid: string, head: string | null): void {
+        const rc = this.default_head[ch.util.getRandomInt(0, this.default_head.length - 1)];
+
+        Hall.getInstance().head_icon.showIcon(uid, head, this.head, rc).then((spf)=>{
+            if(spf != null)
+            this.adaptationIcon(this.head, spf, new Size(55,55));
+        });
         
     }
 
-    show(uid:string,head:string|null):void{
-        const rc=this.default_head[ch.util.getRandomInt(0,this.default_head.length-1)];
-        Hall.getInstance().head_icon.showIcon(uid,head,this.head,rc);
+    adaptationIcon(icon: Sprite, spriteFrameIcon: SpriteFrame, tSize: Size) {
+        if (spriteFrameIcon) {
+            let size = spriteFrameIcon.originalSize
+            //适配图片
+            let iconSize = new Size()
+            let raito = size.width / size.height
+            if (raito < 1) {
+                iconSize.height = tSize.height
+                iconSize.width = tSize.height * raito
+            } else {
+                iconSize.width = tSize.width
+                iconSize.height = tSize.width / raito
+            }
+            icon.spriteFrame = spriteFrameIcon
+            icon.getComponent(UITransform).setContentSize(iconSize)
+
+        }
     }
 }
 

+ 19 - 19
idiom/assets/module_game/ui/UI/UI_Item.ts

@@ -13,7 +13,7 @@ export class UI_Item extends Component {
     @property
     type: number = 0;
     @property(Sprite)
-    Ad:Sprite;
+    Ad: Sprite;
     @property(Label)
     count: Label;
     private _c: number = 0;
@@ -43,16 +43,15 @@ export class UI_Item extends Component {
             }
         }
         this._c = count;
-        if(count!=0)
-        {
+        if (count != 0) {
             this.Ad.node.active = false;
-            this.count.node.parent.active=true;
+            this.count.node.parent.active = true;
             this.count.string = count.toString();
-        }else{
+        } else {
             this.Ad.node.active = true;
-            this.count.node.parent.active=false;
+            this.count.node.parent.active = false;
         }
-        
+
         if (type == 1) {
             // if (GameLink.getInst().lv.dir == LvDir.none) {
             //     this.node.active = false;
@@ -66,19 +65,20 @@ export class UI_Item extends Component {
     private async onClick(evt: any) {
         if (this._c <= 0) {
             if (this.type == 3) {
-                let flag=false;
+                let flag = false;
                 for (let element of gui.get(UI_Main).getLayout<Layout_Main>().Container.node_isIdiom) {
                     console.log(element);
                     if (element == true) {
-                        flag=true;
+                        flag = true;
                         break;
                     }
-                    
+
                 }
-                if(!flag)
-                    Toast.makeText(gui.getLayerNode(5),"槽中无可清除的方块").show();
-                // UINotify.show('槽中无可清除的方块');
-                return;
+                if (!flag) {
+                    Toast.makeText(gui.getLayerNode(5), "槽中无可清除的方块").show();
+                    return;
+                }
+
             }
             const ret = await chsdk.playRewardAd('获得道具' + this.type);
             if (ret) {
@@ -90,18 +90,18 @@ export class UI_Item extends Component {
             // gui.show(UI_ad_get, this.type);
         } else {
             if (this.type == 3) {
-                let flag=false;
+                let flag = false;
                 for (let element of gui.get(UI_Main).getLayout<Layout_Main>().Container.node_isIdiom) {
                     console.log(element);
                     if (element == true) {
                         Hall.getInstance().player.use_item(this.type);
-                        flag=true;
+                        flag = true;
                         break;
                     }
-                    
+
                 }
-                if(!flag)
-                    Toast.makeText(gui.getLayerNode(5),"槽中无可清除的方块").show();
+                if (!flag)
+                    Toast.makeText(gui.getLayerNode(5), "槽中无可清除的方块").show();
                 //UINotify.show('槽中无可清除的方块');
             }
             else {

+ 4 - 4
idiom/assets/module_game/ui/UI_Hall/Hall.prefab

@@ -320,7 +320,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 491,
+      "width": 470,
       "height": 479
     },
     "_anchorPoint": {
@@ -357,7 +357,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "305f3f2a-f953-4845-bb55-0b59766f65df@f9941",
+      "__uuid__": "f63a4dd0-2130-4ab9-b01b-2415545a1b96@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1094,7 +1094,7 @@
       "__id__": 34
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 44
@@ -1309,7 +1309,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 348.5,
+      "y": 181.5,
       "z": 0
     },
     "_lrot": {

+ 5 - 2
idiom/assets/module_game/ui/UI_Hall/UI_Hall.ts

@@ -12,6 +12,8 @@ import { SceneDef } from '../../../Scripts/SceneDef';
 import { UI_Store } from '../UI_Store/UI_Store';
 import { UI_SideBar } from '../UI_SideBar/UI_SideBar';
 import { UI_Task } from '../UI_Task/UI_Task';
+import { Hall } from '../../hall/Hall';
+import { ch } from 'db://assets/ch/ch';
 
 const { ccclass, property } = _decorator;
 
@@ -20,7 +22,7 @@ export class UI_Hall extends ui_base {
     constructor() {
         super(ModuleDef.GAME, 'ui/UI_Hall/Hall', GameUILayers.GAME, Layout_Hall);
     }
-    protected async onCreated() {
+    protected onCreated() {
         const layout = this.getLayout<Layout_Hall>();
         this.onButtonEvent(layout.Start_Btn, () => {
             gui.close(UI_Hall);
@@ -32,7 +34,8 @@ export class UI_Hall extends ui_base {
             gui.show(UI_Settings);
         });
 
-        this.onButtonEvent(layout.Rank_Btn, () => {
+        this.onButtonEvent(layout.Rank_Btn, async() => {
+            await Hall.getInstance().player.loadPfInfo();
             gui.show(UI_Rank);
         });
 

+ 4 - 1
idiom/assets/module_game/ui/UI_Idioms/ScrollView.prefab

@@ -712,7 +712,7 @@
     "_paddingTop": 0,
     "_paddingBottom": 0,
     "_spacingX": 3,
-    "_spacingY": 2,
+    "_spacingY": 0,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,
@@ -744,6 +744,9 @@
     "scrollView": {
       "__id__": 17
     },
+    "content": {
+      "__id__": 19
+    },
     "_id": ""
   },
   {

+ 33 - 17
idiom/assets/module_game/ui/UI_Idioms/UI_Idioms.ts

@@ -25,6 +25,12 @@ export class UI_Idioms extends ui_base {
     public init() {
         const layout = this.getLayout<Layout_Idioms>();
         console.log("init");
+        for (let i = 0; i < this.idioms.length; i++) {
+            this.idioms[i].node.destroy();
+        }
+
+        this.idioms = [];
+
         for (let i = 0; i < layout.Container.idioms.length; i++) {
             let node = instantiate(layout.idiom_prefab);
             node.parent = layout.content;
@@ -40,24 +46,24 @@ export class UI_Idioms extends ui_base {
     public light_Show(cube_infor: Cube_Infor) {
         const layout = this.getLayout<Layout_Idioms>();
         let txt_length = cube_infor.Text.length;
-        this.idioms.forEach(element => {
-            if (element.piece_1_word === cube_infor.Text) {
-                element.hud_sp.node.active = true;
-                element.hud_sp.node.getComponent(UITransform).contentSize = new Size(30 * txt_length, 30);
+        let flag = false;
+        for (let i = 0; i < this.idioms.length; i++) {
+            if (this.idioms[i].piece_1_word === cube_infor.Text) {
+                this.idioms[i].hud_sp.node.active = true;
+                this.idioms[i].hud_sp.node.getComponent(UITransform).contentSize = new Size(30 * txt_length, 30);
                 let target = 0;
-                element.hud_sp.node.position = new Vec3(11 + target * 30, -11.5, 0);
-                let pos = new Vec2(element.node.position.x, element.node.position.y);
-                this.scrollToTarget(pos);
+                this.idioms[i].hud_sp.node.position = new Vec3(11 + target * 30, -11.5, 0);
+                this.scrollToTarget(i);
+
             }
-            else if (element.piece_2_word === cube_infor.Text) {
-                element.hud_sp.node.active = true;
-                element.hud_sp.node.getComponent(UITransform).contentSize = new Size(30 * txt_length, 30);
+            else if (this.idioms[i].piece_2_word === cube_infor.Text) {
+                this.idioms[i].hud_sp.node.active = true;
+                this.idioms[i].hud_sp.node.getComponent(UITransform).contentSize = new Size(30 * txt_length, 30);
                 let target = 4 - txt_length;
-                element.hud_sp.node.position = new Vec3(11 + target * 30, -11.5, 0);
-                let pos = new Vec2(element.node.position.x, element.node.position.y);
-                this.scrollToTarget(pos);
+                this.idioms[i].hud_sp.node.position = new Vec3(11 + target * 30, -11.5, 0);
+                this.scrollToTarget(i);
             }
-        });
+        }
     }
     //取消高亮
     public light_Hide(cube1: Cube_Infor, cube2: Cube_Infor) {
@@ -122,12 +128,22 @@ export class UI_Idioms extends ui_base {
         });
     }
 
-    public scrollToTarget(pos: Vec2) {
+    public scrollToTarget(index: number) {
         const layout = this.getLayout<Layout_Idioms>();
-        layout.scrollView.scrollTo(pos, 0.2, true);
+        let row = Math.trunc(index / 5);
+        if (row == 0) {
+            layout.scrollView.scrollTo(new Vec2(0, 1), 0.2, false);
+        } else if (row == this.idioms.length / 5) {
+            layout.scrollView.scrollTo(new Vec2(0, 0), 0.2, false);
+        } else {
+            let res = Math.trunc(((row) / (Math.trunc((this.idioms.length / 5)) - 2)) * 10) / 10;
+            layout.scrollView.scrollTo(new Vec2(0, 1 - res), 0.2, false);
+            console.log("weizhi:" + (1 - res));
+        }
+
     }
 
-    public all_light_Hide(){
+    public all_light_Hide() {
         this.idioms.forEach(element => {
             element.hud_sp.node.active = false;
         });

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 128 - 326
idiom/assets/module_game/ui/UI_Main/Main.prefab


+ 5 - 5
idiom/assets/module_game/ui/UI_Main/UI_Main.ts

@@ -103,11 +103,11 @@ export class UI_Main extends ui_base {
         layout.Count_Down_Des.string = (minute >= 10 ? minute : '0' + minute) + ':' + (second >= 10 ? second : '0' + second);
         layout.Remain_Cube_Des.string = '剩余:' + gui.get(UI_Idioms).idioms.length * 2;
         layout.Level.string = '第' + (Hall.getInstance().player.get_max_floor() + 1) + '关';
-        if(level==0){
-            layout.Hand.active=true;
-        }else{
-            layout.Hand.active=false;
-        }
+        // if(level==0){
+        //     layout.Hand.active=true;
+        // }else{
+        //     layout.Hand.active=false;
+        // }
         this.running = true;
     }
 

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 354 - 293
idiom/assets/module_game/ui/UI_Rank/Rank.prefab


+ 1 - 1
idiom/assets/module_game/ui/UI_Rank/UI_Rank.ts

@@ -24,7 +24,7 @@ export class UI_Rank extends ui_base {
         super(ModuleDef.GAME, 'ui/UI_Rank/Rank', GameUILayers.HUD, Layout_Rank);
     }
 
-    protected async onCreated() {
+    protected  onCreated() {
         const layout = this.getLayout<Layout_Rank>();
         ani_ui(layout.Close_Btn.node.parent);
         this.onButtonEvent(layout.Close_Btn, async (button: any) => {

+ 351 - 186
idiom/assets/module_game/ui/UI_Rank/UI_Rank_Item.prefab

@@ -28,26 +28,29 @@
         "__id__": 14
       },
       {
-        "__id__": 20
+        "__id__": 21
+      },
+      {
+        "__id__": 36
       },
       {
-        "__id__": 34
+        "__id__": 42
       },
       {
-        "__id__": 40
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 54
       },
       {
-        "__id__": 48
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -352,7 +355,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Num",
+    "_name": "Frame",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -366,14 +369,17 @@
       },
       {
         "__id__": 17
+      },
+      {
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -200.57999999999998,
+      "x": -86.281,
       "y": 0,
       "z": 0
     },
@@ -414,8 +420,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 61,
+      "height": 62
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -426,10 +432,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d0TX3qYIJMwoGQD6SV/muT"
+    "fileId": "1ciYyMyEdDSYvC/FI1kZlw"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "32da00Ug65PLLJF/VDL1/LR",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -440,106 +446,115 @@
     "__prefab": {
       "__id__": 18
     },
+    "head": {
+      "__id__": 19
+    },
+    "default_head": [
+      {
+        "__uuid__": "d210e61f-7be1-41bf-8589-a34e254ce2c3@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "327e764d-5c78-46e3-9d74-21993ed64cee@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "928feab9-ba27-49c8-aaf3-b42ddc4f4c4b@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "ba3f6144-b4a2-4a96-aa3f-e86256b6ac71@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "85b95847-221a-4fe8-a16e-f40ee870b9f1@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "efa38efd-b221-4016-918e-de9e8636f411@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "20fb7420-c726-4a94-8c60-cc4ef52f5173@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "f130b13d-9a76-49fd-bb29-00ec513e89ad@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "b8179371-7221-44ca-8d2f-5017718db540@f9941",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7c5Ocw1UxFwr+8AsXUmgoA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 32
+    },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_string": "1",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 1,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "_shadowOffset": {
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "bbHPFKB3tH65yuDN3K1Pvm"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "8a1Rh3+ZtI7oJlxNtR4zsd",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
     "__type__": "cc.Node",
-    "_name": "Frame",
+    "_name": "Head_Icon",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 1
+      "__id__": 21
     },
-    "_children": [
-      {
-        "__id__": 21
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
-      },
-      {
         "__id__": 29
       },
       {
-        "__id__": 31
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 31
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -86.281,
+      "x": 2.0430000000000064,
       "y": 0,
       "z": 0
     },
@@ -568,13 +583,17 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Head_Icon",
+    "_name": "Mask",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 20
+      "__id__": 1
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 20
+      }
+    ],
     "_active": true,
     "_components": [
       {
@@ -582,14 +601,17 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 28
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -88.32400000000001,
       "y": 0,
       "z": 0
     },
@@ -630,8 +652,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 40
+      "width": 55,
+      "height": 55
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -642,10 +664,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "59o93vlChJYYMHnqnzacAf"
+    "fileId": "64G5Hs3vRG/qsw4cQwws4D"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Mask",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -656,6 +678,28 @@
     "__prefab": {
       "__id__": 25
     },
+    "_type": 1,
+    "_inverted": false,
+    "_segments": 64,
+    "_alphaThreshold": 0.1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9fg25twDFNjYpPVIrbM4Nd"
+  },
+  {
+    "__type__": "cc.Graphics",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 27
+    },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
@@ -666,25 +710,29 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": null,
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_lineWidth": 1,
+    "_strokeColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "_lineJoin": 2,
+    "_lineCap": 0,
+    "_fillColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 0
+    },
+    "_miterLimit": 10,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b3c67KkdFCbZ0VY2NIdX98"
+    "fileId": "b34R99WptD7rDqmrRUv5FV"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -694,7 +742,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "b1aBWr5eVNTaNn63igTDYD",
+    "fileId": "deVVqg1JdPG4AHEQ90g1Xx",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -709,12 +757,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 30
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61,
-      "height": 62
+      "width": 40,
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -725,66 +773,24 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "1ciYyMyEdDSYvC/FI1kZlw"
+    "fileId": "59o93vlChJYYMHnqnzacAf"
   },
   {
-    "__type__": "32da00Ug65PLLJF/VDL1/LR",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 20
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 30
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
     },
-    "head": {
-      "__id__": 24
+    "asset": {
+      "__id__": 0
     },
-    "default_head": [
-      {
-        "__uuid__": "d210e61f-7be1-41bf-8589-a34e254ce2c3@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "327e764d-5c78-46e3-9d74-21993ed64cee@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "928feab9-ba27-49c8-aaf3-b42ddc4f4c4b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ba3f6144-b4a2-4a96-aa3f-e86256b6ac71@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "85b95847-221a-4fe8-a16e-f40ee870b9f1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "efa38efd-b221-4016-918e-de9e8636f411@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "20fb7420-c726-4a94-8c60-cc4ef52f5173@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f130b13d-9a76-49fd-bb29-00ec513e89ad@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b8179371-7221-44ca-8d2f-5017718db540@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      }
-    ],
-    "_id": ""
+    "fileId": "b1aBWr5eVNTaNn63igTDYD",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7c5Ocw1UxFwr+8AsXUmgoA"
+    "fileId": "b3c67KkdFCbZ0VY2NIdX98"
   },
   {
     "__type__": "cc.Sprite",
@@ -792,11 +798,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 20
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -846,6 +852,165 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "Num",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 39
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -200.57999999999998,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 38
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 11.123046875,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d0TX3qYIJMwoGQD6SV/muT"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 40
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "1",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 1,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bbHPFKB3tH65yuDN3K1Pvm"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "8a1Rh3+ZtI7oJlxNtR4zsd",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "Name",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -856,14 +1021,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 43
       },
       {
-        "__id__": 37
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -900,11 +1065,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 42
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 44
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -928,11 +1093,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 42
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 46
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1015,14 +1180,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 49
       },
       {
-        "__id__": 43
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1059,11 +1224,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 50
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1087,11 +1252,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 52
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1172,7 +1337,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1200,7 +1365,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 57
     },
     "Bg": {
       "__id__": 5
@@ -1245,16 +1410,16 @@
       }
     ],
     "Num": {
-      "__id__": 17
+      "__id__": 39
     },
     "Head_Icon": {
-      "__id__": 29
+      "__id__": 17
     },
     "Name": {
-      "__id__": 37
+      "__id__": 45
     },
     "Level": {
-      "__id__": 43
+      "__id__": 51
     },
     "_id": ""
   },

+ 2 - 0
idiom/assets/module_game/ui/UI_Settings/Layout_Settings.ts

@@ -11,6 +11,8 @@ export class Layout_Settings extends Component {
     Toggle_Sound:Toggle;
     @property(Button)
     Defeat_Btn:Button;
+    @property(Button)
+    Replay_Btn:Button;
 }
 
 

+ 355 - 12
idiom/assets/module_game/ui/UI_Settings/Settings.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "",
+    "_name": "Settings",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 148
+        "__id__": 162
       },
       {
-        "__id__": 150
+        "__id__": 164
       },
       {
-        "__id__": 152
+        "__id__": 166
       }
     ],
     "_prefab": {
-      "__id__": 154
+      "__id__": 168
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -291,16 +291,19 @@
       },
       {
         "__id__": 131
+      },
+      {
+        "__id__": 145
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 145
+        "__id__": 159
       }
     ],
     "_prefab": {
-      "__id__": 147
+      "__id__": 161
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3145,7 +3148,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -118.18599999999998,
       "y": -193.86199999999997,
       "z": 0
     },
@@ -3465,17 +3468,354 @@
     "nestedPrefabInstanceRoots": null
   },
   {
+    "__type__": "cc.Node",
+    "_name": "Replay_Btn",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 12
+    },
+    "_children": [
+      {
+        "__id__": 146
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 152
+      },
+      {
+        "__id__": 154
+      },
+      {
+        "__id__": 156
+      }
+    ],
+    "_prefab": {
+      "__id__": 158
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 114.78300000000002,
+      "y": -193.86199999999997,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Txt",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 145
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 147
+      },
+      {
+        "__id__": 149
+      }
+    ],
+    "_prefab": {
+      "__id__": 151
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
+      "__id__": 148
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 104,
+      "height": 52
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b5DUnmRqJOFobqTxOHe+Qo"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
       "__id__": 146
     },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 150
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "1c111257-2e4b-4683-8bf5-98df50149929@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "cf6iDfqHVD75uP/uNuK37R"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "f9bAOagdNEa5uz7Rgf2ZUI",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 145
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 153
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 211,
+      "height": 92
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "29HB5bUHdGZJXoO2A/v3x7"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 145
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 155
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "1c43b4e7-2327-4bb5-92f8-e7a1b26cbb1f@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63DX3JZ75I5oYM0gaEw7+w"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 145
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 157
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 145
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b8P1wR+RFDXJAUtxtXFw8l"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "00zvycniZP6rxyhlN6y1EF",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 160
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
@@ -3515,7 +3855,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 149
+      "__id__": 163
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3543,7 +3883,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 151
+      "__id__": 165
     },
     "Close_Btn": {
       "__id__": 30
@@ -3557,6 +3897,9 @@
     "Defeat_Btn": {
       "__id__": 142
     },
+    "Replay_Btn": {
+      "__id__": 156
+    },
     "_id": ""
   },
   {
@@ -3573,7 +3916,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 153
+      "__id__": 167
     },
     "_alignFlags": 45,
     "_target": null,

+ 9 - 0
idiom/assets/module_game/ui/UI_Settings/UI_Settings.ts

@@ -8,6 +8,7 @@ import ui_base from '../../../core/ui/ui_base';
 import { ResUtil } from '../../../core/util/ResUtil';
 import { ModuleDef } from '../../../Scripts/ModuleDef';
 import { SceneDef } from '../../../Scripts/SceneDef';
+import { Layout_Main } from '../UI_Main/Layout_Main';
 
 const { ccclass, property } = _decorator;
 
@@ -54,6 +55,14 @@ export class UI_Settings extends ui_base {
             gui.show(UI_Hall);
             ResUtil.loadScene(SceneDef.Hall, ModuleDef.GAME, true);
         }, this);
+
+        this.onButtonEvent(layout.Replay_Btn, (button: any) => {
+            gui.get(UI_Main).evt.emit(gui.get(UI_Main).evt.key.next_level);
+            gui.close(UI_Settings);
+            gui.get(UI_Main).getLayout<Layout_Main>().Container.level_idioms();
+            gui.get(UI_Main).evt.emit(gui.get(UI_Main).evt.key.update_ui_idioms);
+            gui.get(UI_Main).evt.emit(gui.get(UI_Main).evt.key.update_remain);
+        }, this);
     }
 }
 

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 255 - 240
idiom/assets/module_game/ui/UI_Sign/Sign.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 276 - 137
idiom/assets/module_game/ui/UI_Store/Store.prefab


+ 4 - 2
idiom/assets/module_game/ui/UI_Store/UI_Store.ts

@@ -25,6 +25,8 @@ export class UI_Store extends ui_base {
         const layout = this.getLayout<Layout_Store>();
         ani_ui(layout.Close_Btn.node.parent);
         let state = Hall.getInstance().player.get_store_state();
+
+        console.log("商店数组:"+state);
         this.onButtonEvent(layout.Close_Btn, async (button: any) => {
             gui.close(UI_Store);
         });
@@ -41,7 +43,7 @@ export class UI_Store extends ui_base {
                             layout.Free_Gets[i].interactable = false;
                             layout.Free_Gets[i].node.getComponent(Sprite).grayscale = true;
                             state[i] = true;
-                            Hall.getInstance().player.set_task_state(state);
+                            Hall.getInstance().player.set_store_state(state);
                             Toast.makeText(gui.getLayerNode(5),'获得道具:'+this.config[i].name).show();
                         }
                     } else {
@@ -53,7 +55,7 @@ export class UI_Store extends ui_base {
                             layout.Free_Gets[i].node.getComponent(Sprite).grayscale = true;
                             this.show_Coin();
                             state[i] = true;
-                            Hall.getInstance().player.set_task_state(state);
+                            Hall.getInstance().player.set_store_state(state);
                             Toast.makeText(gui.getLayerNode(5),'获得铜币:X'+100).show();
                         }
                     }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 350 - 163
idiom/assets/module_game/ui/UI_Task/Task.prefab


+ 1 - 1
idiom/assets/module_game/ui/UI_Task/UI_Task.ts

@@ -28,7 +28,7 @@ export class UI_Task extends  ui_base{
 
         this.task_state = Hall.getInstance().player.get_task_state();
 
-        console.log(this.task_state);
+        console.log("任务数组:"+this.task_state);
 
         for(let i=0;i<layout.Task_Items.length;i++)
         {

+ 1 - 1
idiom/assets/module_game/ui/UI_Task/UI_Task_Item.ts

@@ -88,7 +88,7 @@ export class UI_Task_Item extends Component {
             }
             this.state = true;
             this.Des.string = '已领取';
-            this.Get_Bg.spriteFrame = this.Get_Bgs[1];
+            this.Get_Bg.spriteFrame = this.Get_Bgs[0];
             this.Get.interactable = false;
             gui.get(UI_Task).update_task_state(true, this.index);
         }

+ 9 - 0
idiom/assets/module_game/ui/UI_Tips.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "0439c444-5a03-46a6-8789-0fd6fdede55e",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 1720 - 0
idiom/assets/module_game/ui/UI_Tips/Tips.prefab

@@ -0,0 +1,1720 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "Tips",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Tips",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 70
+      }
+    ],
+    "_prefab": {
+      "__id__": 72
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Mask",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1634
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "abbYTiMUVBS6JtLomgukiQ"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "5cad1374-0d9d-415c-b3dc-fc9c432c8bfe@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "15+kTeY3pBEaiJJ3QEjWiI"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "16XCM/KzxGKI+Z+w4ju47R",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Root",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 35
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 67
+      }
+    ],
+    "_prefab": {
+      "__id__": 69
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Bg",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 660,
+      "height": 510
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60zwCuWLRJ4bJ1tpWfGNk6"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "9f23b761-5c78-423a-9183-9bafc8be77e4@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1cFS6r+ulId6txBL0Ck8LC"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "60Mnw3DSNHnZiLpk8N1hpQ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Title",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 180.164,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 125,
+      "height": 61
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a2j9Wvr0FLkaw/VC21Y3c2"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "a5bde686-e70c-4acc-89c0-52bb4230f73c@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c20iz3VldFFJ1kgzHUvgtQ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ae44X1NMJGLLN7Np8Ax97O",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Close_Btn",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 259.81100000000004,
+      "y": 176.85500000000002,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 102,
+      "height": 103
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "43c5L5kohDdpwrEr5Idckw"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f8a9a7d3-e37e-4963-b39f-fd0b060aa934@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "27I5UOfcRFz4mu4pEosl1z"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 27
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 21
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3dRDKnsVRFk5pZ2MrUp7Ds"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "34f3MbJkBHqKxdBnL0TFaS",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Des",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 25.909999999999968,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 31
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 361,
+      "height": 37
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "beU9V9sUBO4YOH2nQSKPXk"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 33
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "9a6c3a24-8470-4dbf-981a-e3c25224c18b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fTTy03+NLOY2sMC7btMwx"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "6ccLatBMlPTKUAuBOp7MW5",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Btns",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 50
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 64
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Cancel_Btn",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 35
+    },
+    "_children": [
+      {
+        "__id__": 37
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 43
+      },
+      {
+        "__id__": 45
+      },
+      {
+        "__id__": 47
+      }
+    ],
+    "_prefab": {
+      "__id__": 49
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 126.02199999999999,
+      "y": -111.50099999999998,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 36
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 38
+      },
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 42
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 37
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 39
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 97,
+      "height": 48
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c5gxVJodhNoaNRkYCLQXRH"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 37
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "e5d9064a-8f4f-48e9-8155-8ca9537eb8ba@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2bemFwflpJjKaN42mWuIZx"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "83+jS6EglCwbTHfqe/XPlf",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 44
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 245,
+      "height": 108
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fctyOEjbpFLqu75wrJ6zfA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 46
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "ecd57af0-f9f7-44f9-b26a-ea0caf6caefe@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "95Z2uDl8tNa62g49/r5lXS"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 48
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 36
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9fSIu+BOdFcLh2bg1zCyLw"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "0fqE2xoJtLJY7M+wgZhacm",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Ensure_Btn",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 35
+    },
+    "_children": [
+      {
+        "__id__": 51
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 59
+      },
+      {
+        "__id__": 61
+      }
+    ],
+    "_prefab": {
+      "__id__": 63
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -127.44900000000001,
+      "y": -111.50099999999998,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 50
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 54
+      }
+    ],
+    "_prefab": {
+      "__id__": 56
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 53
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 109,
+      "height": 52
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "99WTYEgu5KiqS5wPD6DKji"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 55
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "26412491-b632-47c6-bfcc-0dba1f4ae3ad@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "71i29zQPpCF4qtqrxRwqKp"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5eYsO2BH1BYKQnpzkS6V/y",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 58
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 245,
+      "height": 108
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "94JdFomAxMl7Xr4nJGD/KK"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 60
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "4fb8272b-381b-42ad-b772-1b6019277115@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a4/zdzC7FN6rhzfdNnCB04"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 62
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 50
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d65gDZR+5NCISuquG/8EtG"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "72ObcQalRDSYp4R4F8w1dO",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 65
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a5y97ndvVNYreoi3Dyjs9Y"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "6aYDeKurxAqIWhB1V/gM3P",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 68
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7cgXM9ae5BzrRxcWWogErG"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "9d/Ao11ulN46YHPmuTe7X0",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 71
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d8bmqP1ItC4ZDfwHrU3zPG"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4cxDcl7bBF2olP0vmyFn7M",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

+ 13 - 0
idiom/assets/module_game/ui/UI_Tips/Tips.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "f2ef5fd4-2fbc-4385-b044-63d4ab42cfca",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "Tips"
+  }
+}

+ 9 - 0
idiom/assets/res/Texture.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "3349cdce-24f4-4bad-a8d1-5324a8a89075",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 0 - 0
idiom/assets/res/成语/存放@2x.png → idiom/assets/res/Texture/存放@2x.png


+ 0 - 0
idiom/assets/res/成语/存放@2x.png.meta → idiom/assets/res/Texture/存放@2x.png.meta


+ 0 - 0
idiom/assets/res/解锁槽位/组11@2x.png → idiom/assets/res/Texture/组11@2x.png


+ 0 - 0
idiom/assets/res/解锁槽位/组11@2x.png.meta → idiom/assets/res/Texture/组11@2x.png.meta


+ 1 - 1
idiom/assets/res/侧边栏/SideBar.pac.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.8",
   "importer": "auto-atlas",
   "imported": true,
-  "uuid": "3379e27d-fadd-4d99-8295-914d0aa5582c",
+  "uuid": "2595642e-3080-4908-8e5d-2cb2b3afdbda",
   "files": [
     ".json"
   ],

+ 0 - 0
idiom/assets/res/加载页/矩形1拷贝@2x.png → idiom/assets/res/加载页/Bar.png


+ 134 - 0
idiom/assets/res/加载页/Bar.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "832e573e-b536-4f76-87b9-2522b4c08001",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "832e573e-b536-4f76-87b9-2522b4c08001@6c48a",
+      "displayName": "Bar",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "832e573e-b536-4f76-87b9-2522b4c08001",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "832e573e-b536-4f76-87b9-2522b4c08001@f9941",
+      "displayName": "Bar",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 219,
+        "height": 18,
+        "rawWidth": 219,
+        "rawHeight": 18,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 15,
+        "borderRight": 15,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -109.5,
+            -9,
+            0,
+            109.5,
+            -9,
+            0,
+            -109.5,
+            9,
+            0,
+            109.5,
+            9,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            18,
+            219,
+            18,
+            0,
+            0,
+            219,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -109.5,
+            -9,
+            0
+          ],
+          "maxPos": [
+            109.5,
+            9,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "832e573e-b536-4f76-87b9-2522b4c08001@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "832e573e-b536-4f76-87b9-2522b4c08001@6c48a"
+  }
+}

+ 1 - 1
idiom/assets/res/加载页/Loading.pac.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.8",
   "importer": "auto-atlas",
   "imported": true,
-  "uuid": "a63114f7-5b8e-4198-b75a-922458c1a293",
+  "uuid": "cc51e6d0-1169-4a90-ac7e-bf7e32fb67eb",
   "files": [
     ".json"
   ],

+ 0 - 0
idiom/assets/res/加载页/矩形1@2x.png → idiom/assets/res/加载页/LoadingBar_Bg.png


+ 134 - 0
idiom/assets/res/加载页/LoadingBar_Bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "4c6ba2d2-8a93-4839-a2fc-e37717146604",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "4c6ba2d2-8a93-4839-a2fc-e37717146604@6c48a",
+      "displayName": "LoadingBar_Bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "4c6ba2d2-8a93-4839-a2fc-e37717146604",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "4c6ba2d2-8a93-4839-a2fc-e37717146604@f9941",
+      "displayName": "LoadingBar_Bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 647,
+        "height": 32,
+        "rawWidth": 647,
+        "rawHeight": 32,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -323.5,
+            -16,
+            0,
+            323.5,
+            -16,
+            0,
+            -323.5,
+            16,
+            0,
+            323.5,
+            16,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            32,
+            647,
+            32,
+            0,
+            0,
+            647,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -323.5,
+            -16,
+            0
+          ],
+          "maxPos": [
+            323.5,
+            16,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "4c6ba2d2-8a93-4839-a2fc-e37717146604@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "4c6ba2d2-8a93-4839-a2fc-e37717146604@6c48a"
+  }
+}

BIN
idiom/assets/res/加载页/大背景@2x.png


+ 0 - 134
idiom/assets/res/加载页/大背景@2x.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "5195ff34-a6fb-4b4a-aa64-810910eeb86a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "5195ff34-a6fb-4b4a-aa64-810910eeb86a@6c48a",
-      "displayName": "大背景@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5195ff34-a6fb-4b4a-aa64-810910eeb86a",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "5195ff34-a6fb-4b4a-aa64-810910eeb86a@f9941",
-      "displayName": "大背景@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 750,
-        "height": 1634,
-        "rawWidth": 750,
-        "rawHeight": 1634,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -375,
-            -817,
-            0,
-            375,
-            -817,
-            0,
-            -375,
-            817,
-            0,
-            375,
-            817,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            1634,
-            750,
-            1634,
-            0,
-            0,
-            750,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -375,
-            -817,
-            0
-          ],
-          "maxPos": [
-            375,
-            817,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5195ff34-a6fb-4b4a-aa64-810910eeb86a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": false,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5195ff34-a6fb-4b4a-aa64-810910eeb86a@6c48a"
-  }
-}

+ 0 - 0
idiom/assets/res/加载页/新建文件夹/beijing_07@2x.jpg → idiom/assets/res/加载页/新建文件夹/Bg.jpg


+ 134 - 0
idiom/assets/res/加载页/新建文件夹/Bg.jpg.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c66df3f2-e185-41e3-90cd-7458a65e21a9",
+  "files": [
+    ".jpg",
+    ".json"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c66df3f2-e185-41e3-90cd-7458a65e21a9@6c48a",
+      "displayName": "Bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c66df3f2-e185-41e3-90cd-7458a65e21a9",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "c66df3f2-e185-41e3-90cd-7458a65e21a9@f9941",
+      "displayName": "Bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 750,
+        "height": 1634,
+        "rawWidth": 750,
+        "rawHeight": 1634,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -375,
+            -817,
+            0,
+            375,
+            -817,
+            0,
+            -375,
+            817,
+            0,
+            375,
+            817,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1634,
+            750,
+            1634,
+            0,
+            0,
+            750,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -375,
+            -817,
+            0
+          ],
+          "maxPos": [
+            375,
+            817,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c66df3f2-e185-41e3-90cd-7458a65e21a9@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": false,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c66df3f2-e185-41e3-90cd-7458a65e21a9@6c48a"
+  }
+}

+ 0 - 134
idiom/assets/res/加载页/新建文件夹/beijing_07@2x.jpg.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "c66df3f2-e185-41e3-90cd-7458a65e21a9",
-  "files": [
-    ".jpg",
-    ".json"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "c66df3f2-e185-41e3-90cd-7458a65e21a9@6c48a",
-      "displayName": "beijing_07@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "c66df3f2-e185-41e3-90cd-7458a65e21a9",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "c66df3f2-e185-41e3-90cd-7458a65e21a9@f9941",
-      "displayName": "beijing_07@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 750,
-        "height": 1634,
-        "rawWidth": 750,
-        "rawHeight": 1634,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -375,
-            -817,
-            0,
-            375,
-            -817,
-            0,
-            -375,
-            817,
-            0,
-            375,
-            817,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            1634,
-            750,
-            1634,
-            0,
-            0,
-            750,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -375,
-            -817,
-            0
-          ],
-          "maxPos": [
-            375,
-            817,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "c66df3f2-e185-41e3-90cd-7458a65e21a9@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": false,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c66df3f2-e185-41e3-90cd-7458a65e21a9@6c48a"
-  }
-}

BIN
idiom/assets/res/加载页/新建文件夹/cyxlx.png


+ 134 - 0
idiom/assets/res/加载页/新建文件夹/cyxlx.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f63a4dd0-2130-4ab9-b01b-2415545a1b96",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f63a4dd0-2130-4ab9-b01b-2415545a1b96@6c48a",
+      "displayName": "cyxlx",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f63a4dd0-2130-4ab9-b01b-2415545a1b96",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "f63a4dd0-2130-4ab9-b01b-2415545a1b96@f9941",
+      "displayName": "cyxlx",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 470,
+        "height": 479,
+        "rawWidth": 470,
+        "rawHeight": 479,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -235,
+            -239.5,
+            0,
+            235,
+            -239.5,
+            0,
+            -235,
+            239.5,
+            0,
+            235,
+            239.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            479,
+            470,
+            479,
+            0,
+            0,
+            470,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -235,
+            -239.5,
+            0
+          ],
+          "maxPos": [
+            235,
+            239.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f63a4dd0-2130-4ab9-b01b-2415545a1b96@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "f63a4dd0-2130-4ab9-b01b-2415545a1b96@6c48a"
+  }
+}

BIN
idiom/assets/res/加载页/新建文件夹/cyxlx_Healthy.png


+ 134 - 0
idiom/assets/res/加载页/新建文件夹/cyxlx_Healthy.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c4e9bb3e-e793-4e94-bd16-a6fafb050a6d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c4e9bb3e-e793-4e94-bd16-a6fafb050a6d@6c48a",
+      "displayName": "cyxlx_Healthy",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c4e9bb3e-e793-4e94-bd16-a6fafb050a6d",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "c4e9bb3e-e793-4e94-bd16-a6fafb050a6d@f9941",
+      "displayName": "cyxlx_Healthy",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 675,
+        "height": 127,
+        "rawWidth": 675,
+        "rawHeight": 127,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -337.5,
+            -63.5,
+            0,
+            337.5,
+            -63.5,
+            0,
+            -337.5,
+            63.5,
+            0,
+            337.5,
+            63.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            127,
+            675,
+            127,
+            0,
+            0,
+            675,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -337.5,
+            -63.5,
+            0
+          ],
+          "maxPos": [
+            337.5,
+            63.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c4e9bb3e-e793-4e94-bd16-a6fafb050a6d@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c4e9bb3e-e793-4e94-bd16-a6fafb050a6d@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/加载页/新建文件夹/标题@2x.png → idiom/assets/res/加载页/新建文件夹/kndlh.png


+ 134 - 0
idiom/assets/res/加载页/新建文件夹/kndlh.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "305f3f2a-f953-4845-bb55-0b59766f65df",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "305f3f2a-f953-4845-bb55-0b59766f65df@6c48a",
+      "displayName": "kndlh",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "305f3f2a-f953-4845-bb55-0b59766f65df",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "305f3f2a-f953-4845-bb55-0b59766f65df@f9941",
+      "displayName": "kndlh",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 491,
+        "height": 479,
+        "rawWidth": 491,
+        "rawHeight": 479,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -245.5,
+            -239.5,
+            0,
+            245.5,
+            -239.5,
+            0,
+            -245.5,
+            239.5,
+            0,
+            245.5,
+            239.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            479,
+            491,
+            479,
+            0,
+            0,
+            491,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -245.5,
+            -239.5,
+            0
+          ],
+          "maxPos": [
+            245.5,
+            239.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "305f3f2a-f953-4845-bb55-0b59766f65df@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "305f3f2a-f953-4845-bb55-0b59766f65df@6c48a"
+  }
+}

BIN
idiom/assets/res/加载页/新建文件夹/kndlh_Heality.png


+ 134 - 0
idiom/assets/res/加载页/新建文件夹/kndlh_Heality.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "cb26daa8-f789-4941-b230-996c3ffb93d6",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "cb26daa8-f789-4941-b230-996c3ffb93d6@6c48a",
+      "displayName": "kndlh_Heality",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "cb26daa8-f789-4941-b230-996c3ffb93d6",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "cb26daa8-f789-4941-b230-996c3ffb93d6@f9941",
+      "displayName": "kndlh_Heality",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 675,
+        "height": 127,
+        "rawWidth": 675,
+        "rawHeight": 127,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -337.5,
+            -63.5,
+            0,
+            337.5,
+            -63.5,
+            0,
+            -337.5,
+            63.5,
+            0,
+            337.5,
+            63.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            127,
+            675,
+            127,
+            0,
+            0,
+            675,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -337.5,
+            -63.5,
+            0
+          ],
+          "maxPos": [
+            337.5,
+            63.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "cb26daa8-f789-4941-b230-996c3ffb93d6@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "cb26daa8-f789-4941-b230-996c3ffb93d6@6c48a"
+  }
+}

+ 0 - 134
idiom/assets/res/加载页/新建文件夹/标题@2x.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "305f3f2a-f953-4845-bb55-0b59766f65df",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "305f3f2a-f953-4845-bb55-0b59766f65df@6c48a",
-      "displayName": "标题@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "305f3f2a-f953-4845-bb55-0b59766f65df",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "305f3f2a-f953-4845-bb55-0b59766f65df@f9941",
-      "displayName": "标题@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 491,
-        "height": 479,
-        "rawWidth": 491,
-        "rawHeight": 479,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -245.5,
-            -239.5,
-            0,
-            245.5,
-            -239.5,
-            0,
-            -245.5,
-            239.5,
-            0,
-            245.5,
-            239.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            479,
-            491,
-            479,
-            0,
-            0,
-            491,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -245.5,
-            -239.5,
-            0
-          ],
-          "maxPos": [
-            245.5,
-            239.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "305f3f2a-f953-4845-bb55-0b59766f65df@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "305f3f2a-f953-4845-bb55-0b59766f65df@6c48a"
-  }
-}

+ 0 - 134
idiom/assets/res/加载页/矩形1@2x.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "4c6ba2d2-8a93-4839-a2fc-e37717146604",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "4c6ba2d2-8a93-4839-a2fc-e37717146604@6c48a",
-      "displayName": "矩形1@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4c6ba2d2-8a93-4839-a2fc-e37717146604",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "4c6ba2d2-8a93-4839-a2fc-e37717146604@f9941",
-      "displayName": "矩形1@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 647,
-        "height": 32,
-        "rawWidth": 647,
-        "rawHeight": 32,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -323.5,
-            -16,
-            0,
-            323.5,
-            -16,
-            0,
-            -323.5,
-            16,
-            0,
-            323.5,
-            16,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            32,
-            647,
-            32,
-            0,
-            0,
-            647,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -323.5,
-            -16,
-            0
-          ],
-          "maxPos": [
-            323.5,
-            16,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4c6ba2d2-8a93-4839-a2fc-e37717146604@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4c6ba2d2-8a93-4839-a2fc-e37717146604@6c48a"
-  }
-}

+ 0 - 134
idiom/assets/res/加载页/矩形1拷贝@2x.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "832e573e-b536-4f76-87b9-2522b4c08001",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "832e573e-b536-4f76-87b9-2522b4c08001@6c48a",
-      "displayName": "矩形1拷贝@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "832e573e-b536-4f76-87b9-2522b4c08001",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "832e573e-b536-4f76-87b9-2522b4c08001@f9941",
-      "displayName": "矩形1拷贝@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 219,
-        "height": 18,
-        "rawWidth": 219,
-        "rawHeight": 18,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 15,
-        "borderRight": 15,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -109.5,
-            -9,
-            0,
-            109.5,
-            -9,
-            0,
-            -109.5,
-            9,
-            0,
-            109.5,
-            9,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            18,
-            219,
-            18,
-            0,
-            0,
-            219,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -109.5,
-            -9,
-            0
-          ],
-          "maxPos": [
-            109.5,
-            9,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "832e573e-b536-4f76-87b9-2522b4c08001@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "832e573e-b536-4f76-87b9-2522b4c08001@6c48a"
-  }
-}

BIN
idiom/assets/res/加载页/组19@2x.png


+ 0 - 134
idiom/assets/res/加载页/组19@2x.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a27b75c6-a0a2-4c39-aa28-fcf5fd545ddb",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a27b75c6-a0a2-4c39-aa28-fcf5fd545ddb@6c48a",
-      "displayName": "组19@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a27b75c6-a0a2-4c39-aa28-fcf5fd545ddb",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a27b75c6-a0a2-4c39-aa28-fcf5fd545ddb@f9941",
-      "displayName": "组19@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 706,
-        "height": 128,
-        "rawWidth": 706,
-        "rawHeight": 128,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -353,
-            -64,
-            0,
-            353,
-            -64,
-            0,
-            -353,
-            64,
-            0,
-            353,
-            64,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            128,
-            706,
-            128,
-            0,
-            0,
-            706,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -353,
-            -64,
-            0
-          ],
-          "maxPos": [
-            353,
-            64,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a27b75c6-a0a2-4c39-aa28-fcf5fd545ddb@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a27b75c6-a0a2-4c39-aa28-fcf5fd545ddb@6c48a"
-  }
-}

+ 0 - 134
idiom/assets/res/商城/96bc665b03b6475706153389ebd263b93c96010ece6-xqd2Y1@2x.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "b224bebb-7892-4589-a54c-2da395b0419f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "b224bebb-7892-4589-a54c-2da395b0419f@6c48a",
-      "displayName": "96bc665b03b6475706153389ebd263b93c96010ece6-xqd2Y1@2x",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b224bebb-7892-4589-a54c-2da395b0419f",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "b224bebb-7892-4589-a54c-2da395b0419f@f9941",
-      "displayName": "96bc665b03b6475706153389ebd263b93c96010ece6-xqd2Y1@2x",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 36,
-        "height": 27,
-        "rawWidth": 36,
-        "rawHeight": 27,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -18,
-            -13.5,
-            0,
-            18,
-            -13.5,
-            0,
-            -18,
-            13.5,
-            0,
-            18,
-            13.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            27,
-            36,
-            27,
-            0,
-            0,
-            36,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -18,
-            -13.5,
-            0
-          ],
-          "maxPos": [
-            18,
-            13.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b224bebb-7892-4589-a54c-2da395b0419f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b224bebb-7892-4589-a54c-2da395b0419f@6c48a"
-  }
-}

+ 0 - 0
idiom/assets/res/商城/96bc665b03b6475706153389ebd263b93c96010ece6-xqd2Y1@2x.png → idiom/assets/res/商城/Ad_Logo.png


+ 134 - 0
idiom/assets/res/商城/Ad_Logo.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "b224bebb-7892-4589-a54c-2da395b0419f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "b224bebb-7892-4589-a54c-2da395b0419f@6c48a",
+      "displayName": "Ad_Logo",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b224bebb-7892-4589-a54c-2da395b0419f",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "b224bebb-7892-4589-a54c-2da395b0419f@f9941",
+      "displayName": "Ad_Logo",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 36,
+        "height": 27,
+        "rawWidth": 36,
+        "rawHeight": 27,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -18,
+            -13.5,
+            0,
+            18,
+            -13.5,
+            0,
+            -18,
+            13.5,
+            0,
+            18,
+            13.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            27,
+            36,
+            27,
+            0,
+            0,
+            36,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -18,
+            -13.5,
+            0
+          ],
+          "maxPos": [
+            18,
+            13.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b224bebb-7892-4589-a54c-2da395b0419f@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "b224bebb-7892-4589-a54c-2da395b0419f@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/加时间.png → idiom/assets/res/商城/AddTime_Des.png


+ 134 - 0
idiom/assets/res/商城/AddTime_Des.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "60be6867-92bc-431f-ae11-dfae14e7731b",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "60be6867-92bc-431f-ae11-dfae14e7731b@6c48a",
+      "displayName": "AddTime_Des",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "60be6867-92bc-431f-ae11-dfae14e7731b",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "60be6867-92bc-431f-ae11-dfae14e7731b@f9941",
+      "displayName": "AddTime_Des",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 230,
+        "height": 23,
+        "rawWidth": 230,
+        "rawHeight": 23,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -115,
+            -11.5,
+            0,
+            115,
+            -11.5,
+            0,
+            -115,
+            11.5,
+            0,
+            115,
+            11.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            23,
+            230,
+            23,
+            0,
+            0,
+            230,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -115,
+            -11.5,
+            0
+          ],
+          "maxPos": [
+            115,
+            11.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "60be6867-92bc-431f-ae11-dfae14e7731b@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "60be6867-92bc-431f-ae11-dfae14e7731b@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/背景@2x.png → idiom/assets/res/商城/Bg.png


+ 134 - 0
idiom/assets/res/商城/Bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "9b9405a7-e766-4f5b-b35c-4cd3ef1f762d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "9b9405a7-e766-4f5b-b35c-4cd3ef1f762d@6c48a",
+      "displayName": "Bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "9b9405a7-e766-4f5b-b35c-4cd3ef1f762d",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "9b9405a7-e766-4f5b-b35c-4cd3ef1f762d@f9941",
+      "displayName": "Bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 730,
+        "height": 938,
+        "rawWidth": 730,
+        "rawHeight": 938,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -365,
+            -469,
+            0,
+            365,
+            -469,
+            0,
+            -365,
+            469,
+            0,
+            365,
+            469,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            938,
+            730,
+            938,
+            0,
+            0,
+            730,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -365,
+            -469,
+            0
+          ],
+          "maxPos": [
+            365,
+            469,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "9b9405a7-e766-4f5b-b35c-4cd3ef1f762d@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "9b9405a7-e766-4f5b-b35c-4cd3ef1f762d@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/x按钮@2x@2x.png → idiom/assets/res/商城/Close.png


+ 134 - 0
idiom/assets/res/商城/Close.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "9eee25a2-839d-4073-9e70-81ef6584b23e",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "9eee25a2-839d-4073-9e70-81ef6584b23e@6c48a",
+      "displayName": "Close",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "9eee25a2-839d-4073-9e70-81ef6584b23e",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "9eee25a2-839d-4073-9e70-81ef6584b23e@f9941",
+      "displayName": "Close",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 95,
+        "height": 92,
+        "rawWidth": 95,
+        "rawHeight": 92,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -47.5,
+            -46,
+            0,
+            47.5,
+            -46,
+            0,
+            -47.5,
+            46,
+            0,
+            47.5,
+            46,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            92,
+            95,
+            92,
+            0,
+            0,
+            95,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -47.5,
+            -46,
+            0
+          ],
+          "maxPos": [
+            47.5,
+            46,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "9eee25a2-839d-4073-9e70-81ef6584b23e@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "9eee25a2-839d-4073-9e70-81ef6584b23e@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/图层3拷贝@2x.png → idiom/assets/res/商城/CoinGet_Bg.png


+ 134 - 0
idiom/assets/res/商城/CoinGet_Bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "91b46207-b8a6-4bbe-9b2e-f12e88d91969",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "91b46207-b8a6-4bbe-9b2e-f12e88d91969@6c48a",
+      "displayName": "CoinGet_Bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "91b46207-b8a6-4bbe-9b2e-f12e88d91969",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "91b46207-b8a6-4bbe-9b2e-f12e88d91969@f9941",
+      "displayName": "CoinGet_Bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 149,
+        "height": 60,
+        "rawWidth": 149,
+        "rawHeight": 60,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -74.5,
+            -30,
+            0,
+            74.5,
+            -30,
+            0,
+            -74.5,
+            30,
+            0,
+            74.5,
+            30,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            60,
+            149,
+            60,
+            0,
+            0,
+            149,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -74.5,
+            -30,
+            0
+          ],
+          "maxPos": [
+            74.5,
+            30,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "91b46207-b8a6-4bbe-9b2e-f12e88d91969@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "91b46207-b8a6-4bbe-9b2e-f12e88d91969@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/金币.png → idiom/assets/res/商城/Coin_Des.png


+ 134 - 0
idiom/assets/res/商城/Coin_Des.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "bde86812-0278-404e-9ff0-71c1237808a6",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "bde86812-0278-404e-9ff0-71c1237808a6@6c48a",
+      "displayName": "Coin_Des",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "bde86812-0278-404e-9ff0-71c1237808a6",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "bde86812-0278-404e-9ff0-71c1237808a6@f9941",
+      "displayName": "Coin_Des",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 388,
+        "height": 24,
+        "rawWidth": 388,
+        "rawHeight": 24,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -194,
+            -12,
+            0,
+            194,
+            -12,
+            0,
+            -194,
+            12,
+            0,
+            194,
+            12,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            24,
+            388,
+            24,
+            0,
+            0,
+            388,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -194,
+            -12,
+            0
+          ],
+          "maxPos": [
+            194,
+            12,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "bde86812-0278-404e-9ff0-71c1237808a6@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "bde86812-0278-404e-9ff0-71c1237808a6@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/消除.png → idiom/assets/res/商城/Eliminate_Des.png


+ 134 - 0
idiom/assets/res/商城/Eliminate_Des.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c4173a66-8de2-45e7-b2f4-c174062cdcfd",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c4173a66-8de2-45e7-b2f4-c174062cdcfd@6c48a",
+      "displayName": "Eliminate_Des",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c4173a66-8de2-45e7-b2f4-c174062cdcfd",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "c4173a66-8de2-45e7-b2f4-c174062cdcfd@f9941",
+      "displayName": "Eliminate_Des",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 251,
+        "height": 23,
+        "rawWidth": 251,
+        "rawHeight": 23,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -125.5,
+            -11.5,
+            0,
+            125.5,
+            -11.5,
+            0,
+            -125.5,
+            11.5,
+            0,
+            125.5,
+            11.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            23,
+            251,
+            23,
+            0,
+            0,
+            251,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -125.5,
+            -11.5,
+            0
+          ],
+          "maxPos": [
+            125.5,
+            11.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c4173a66-8de2-45e7-b2f4-c174062cdcfd@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c4173a66-8de2-45e7-b2f4-c174062cdcfd@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/清空.png → idiom/assets/res/商城/Empty_Des.png


+ 134 - 0
idiom/assets/res/商城/Empty_Des.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "cf8a45ab-596a-4cad-ac8a-07f927270441",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "cf8a45ab-596a-4cad-ac8a-07f927270441@6c48a",
+      "displayName": "Empty_Des",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "cf8a45ab-596a-4cad-ac8a-07f927270441",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "cf8a45ab-596a-4cad-ac8a-07f927270441@f9941",
+      "displayName": "Empty_Des",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 345,
+        "height": 23,
+        "rawWidth": 345,
+        "rawHeight": 23,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -172.5,
+            -11.5,
+            0,
+            172.5,
+            -11.5,
+            0,
+            -172.5,
+            11.5,
+            0,
+            172.5,
+            11.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            23,
+            345,
+            23,
+            0,
+            0,
+            345,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -172.5,
+            -11.5,
+            0
+          ],
+          "maxPos": [
+            172.5,
+            11.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "cf8a45ab-596a-4cad-ac8a-07f927270441@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "cf8a45ab-596a-4cad-ac8a-07f927270441@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/矩形6@2x.png → idiom/assets/res/商城/Frame.png


+ 134 - 0
idiom/assets/res/商城/Frame.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "907d97fa-ccf8-4d78-ad26-08468d1ec2f0",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "907d97fa-ccf8-4d78-ad26-08468d1ec2f0@6c48a",
+      "displayName": "Frame",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "907d97fa-ccf8-4d78-ad26-08468d1ec2f0",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "907d97fa-ccf8-4d78-ad26-08468d1ec2f0@f9941",
+      "displayName": "Frame",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 214,
+        "height": 69,
+        "rawWidth": 214,
+        "rawHeight": 69,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -107,
+            -34.5,
+            0,
+            107,
+            -34.5,
+            0,
+            -107,
+            34.5,
+            0,
+            107,
+            34.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            69,
+            214,
+            69,
+            0,
+            0,
+            214,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -107,
+            -34.5,
+            0
+          ],
+          "maxPos": [
+            107,
+            34.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "907d97fa-ccf8-4d78-ad26-08468d1ec2f0@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "907d97fa-ccf8-4d78-ad26-08468d1ec2f0@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/免费@2x.png → idiom/assets/res/商城/Free.png


+ 134 - 0
idiom/assets/res/商城/Free.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "7580ed16-9290-480e-9e22-0418a1cf268f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "7580ed16-9290-480e-9e22-0418a1cf268f@6c48a",
+      "displayName": "Free",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "7580ed16-9290-480e-9e22-0418a1cf268f",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "7580ed16-9290-480e-9e22-0418a1cf268f@f9941",
+      "displayName": "Free",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 58,
+        "height": 32,
+        "rawWidth": 58,
+        "rawHeight": 32,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -29,
+            -16,
+            0,
+            29,
+            -16,
+            0,
+            -29,
+            16,
+            0,
+            29,
+            16,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            32,
+            58,
+            32,
+            0,
+            0,
+            58,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -29,
+            -16,
+            0
+          ],
+          "maxPos": [
+            29,
+            16,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "7580ed16-9290-480e-9e22-0418a1cf268f@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "7580ed16-9290-480e-9e22-0418a1cf268f@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/图层3@2x.png → idiom/assets/res/商城/Free_Bg.png


+ 134 - 0
idiom/assets/res/商城/Free_Bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "6407a5be-ea35-456e-8bd7-aa8f81313d64",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "6407a5be-ea35-456e-8bd7-aa8f81313d64@6c48a",
+      "displayName": "Free_Bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "6407a5be-ea35-456e-8bd7-aa8f81313d64",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "6407a5be-ea35-456e-8bd7-aa8f81313d64@f9941",
+      "displayName": "Free_Bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 143,
+        "height": 57,
+        "rawWidth": 143,
+        "rawHeight": 57,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -71.5,
+            -28.5,
+            0,
+            71.5,
+            -28.5,
+            0,
+            -71.5,
+            28.5,
+            0,
+            71.5,
+            28.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            57,
+            143,
+            57,
+            0,
+            0,
+            143,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -71.5,
+            -28.5,
+            0
+          ],
+          "maxPos": [
+            71.5,
+            28.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "6407a5be-ea35-456e-8bd7-aa8f81313d64@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "6407a5be-ea35-456e-8bd7-aa8f81313d64@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/直线1@2x.png → idiom/assets/res/商城/Line.png


+ 134 - 0
idiom/assets/res/商城/Line.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "67f8c932-689f-447a-ab99-381a27150070",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "67f8c932-689f-447a-ab99-381a27150070@6c48a",
+      "displayName": "Line",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "67f8c932-689f-447a-ab99-381a27150070",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "67f8c932-689f-447a-ab99-381a27150070@f9941",
+      "displayName": "Line",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 541,
+        "height": 4,
+        "rawWidth": 541,
+        "rawHeight": 4,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -270.5,
+            -2,
+            0,
+            270.5,
+            -2,
+            0,
+            -270.5,
+            2,
+            0,
+            270.5,
+            2,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            4,
+            541,
+            4,
+            0,
+            0,
+            541,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -270.5,
+            -2,
+            0
+          ],
+          "maxPos": [
+            270.5,
+            2,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "67f8c932-689f-447a-ab99-381a27150070@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "67f8c932-689f-447a-ab99-381a27150070@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/洗牌.png → idiom/assets/res/商城/Shuffle_Des.png


+ 134 - 0
idiom/assets/res/商城/Shuffle_Des.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "6c721643-d9ac-4c55-8270-6165479d1b85",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "6c721643-d9ac-4c55-8270-6165479d1b85@6c48a",
+      "displayName": "Shuffle_Des",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "6c721643-d9ac-4c55-8270-6165479d1b85",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "6c721643-d9ac-4c55-8270-6165479d1b85@f9941",
+      "displayName": "Shuffle_Des",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 374,
+        "height": 24,
+        "rawWidth": 374,
+        "rawHeight": 24,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -187,
+            -12,
+            0,
+            187,
+            -12,
+            0,
+            -187,
+            12,
+            0,
+            187,
+            12,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            24,
+            374,
+            24,
+            0,
+            0,
+            374,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -187,
+            -12,
+            0
+          ],
+          "maxPos": [
+            187,
+            12,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "6c721643-d9ac-4c55-8270-6165479d1b85@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "6c721643-d9ac-4c55-8270-6165479d1b85@6c48a"
+  }
+}

+ 1 - 1
idiom/assets/res/商城/Store.pac.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.8",
   "importer": "auto-atlas",
   "imported": true,
-  "uuid": "8924cf2d-a7a0-4ce7-9fa7-f89dadbdf4f4",
+  "uuid": "d7f7b419-7181-4b77-989c-8ff4fd76df26",
   "files": [
     ".json"
   ],

+ 0 - 0
idiom/assets/res/商城/标题2.png → idiom/assets/res/商城/Title.png


+ 134 - 0
idiom/assets/res/商城/Title.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "417044d7-4ff1-48b4-b247-0d34c19c1f98",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "417044d7-4ff1-48b4-b247-0d34c19c1f98@6c48a",
+      "displayName": "Title",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "417044d7-4ff1-48b4-b247-0d34c19c1f98",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "417044d7-4ff1-48b4-b247-0d34c19c1f98@f9941",
+      "displayName": "Title",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 105,
+        "height": 56,
+        "rawWidth": 105,
+        "rawHeight": 56,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -52.5,
+            -28,
+            0,
+            52.5,
+            -28,
+            0,
+            -52.5,
+            28,
+            0,
+            52.5,
+            28,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            56,
+            105,
+            56,
+            0,
+            0,
+            105,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -52.5,
+            -28,
+            0
+          ],
+          "maxPos": [
+            52.5,
+            28,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "417044d7-4ff1-48b4-b247-0d34c19c1f98@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "417044d7-4ff1-48b4-b247-0d34c19c1f98@6c48a"
+  }
+}

+ 0 - 0
idiom/assets/res/商城/标题.png → idiom/assets/res/商城/TitleBg.png


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است