1

438_talks_0325_01/.idea/workspace.xml

@@ -54,6 +54,7 @@
       <workItem from="1586438372683" duration="321000" />
       <workItem from="1586438707143" duration="1535000" />
       <workItem from="1586527339888" duration="460000" />
+      <workItem from="1586869759199" duration="990000" />
     </task>
     <servers />
   </component>

438_talks_0325_01/bin-debug/modules/view/courseware/index2.js

@@ -38,7 +38,7 @@ var modules;
 (function (modules) {
     /**
      * <p></p>
-     * @date  :2020-04-09 21:28:19
+     * @date  :2020-04-14 21:22:06
      * @EasyGame.org Tools
      */
     var index2 = (function (_super) {
@@ -47,9 +47,9 @@ var modules;
             var _this = _super.call(this, true) || this;
             _this.resourceRoot = "";
             _this.resSpriteSheet = "index2"; //合并材质资源名称
-            _this.resTexture = ["2", "page02-12", "red", "yellow"]; //单材质资源名称
+            _this.resTexture = ["2", "yellow", "page02-12", "red"]; //单材质资源名称
             _this.resGroup = ["courseware_index2"]; //配置文件的Group
-            _this.resFiles = ["courseware/index2_loader_200409212819.json"]; //需要下载的资源group
+            _this.resFiles = ["courseware/index2_loader_200414212206.json"]; //需要下载的资源group
             _this.spriteSheet = null; //ui对应的材质集,已经分割好,方便外部读取方便
             _this.group = null;
             _this.imgas = null;
@@ -142,29 +142,29 @@ var modules;
             this.groupCont.showBg = false;
             this.groupCont.border = false;
             this.groupCont.x = 46;
-            this.groupCont.y = 167;
+            this.groupCont.y = 247;
             this.groupCont.width = 574;
             this.groupCont.height = 626;
             //imgCont 
             this.imgCont = new easy.Image(true);
             this.imgCont.name = "imgCont";
             this.groupCont.addChild(this.imgCont);
-            this.imgCont.width = 574;
-            this.imgCont.height = 626;
+            this.imgCont.width = 575;
+            this.imgCont.height = 453;
             //imgClick 
             this.imgClick = new easy.Image(true);
             this.imgClick.name = "imgClick";
             this.groupCont.addChild(this.imgClick);
-            this.imgClick.x = 307;
-            this.imgClick.y = 92;
-            this.imgClick.width = 212;
-            this.imgClick.height = 68;
+            this.imgClick.x = 7;
+            this.imgClick.y = 32;
+            this.imgClick.width = 132;
+            this.imgClick.height = 62;
             //imgPorinter 
             this.imgPorinter = new easy.Image(true);
             this.imgPorinter.name = "imgPorinter";
             this.groupCont.addChild(this.imgPorinter);
-            this.imgPorinter.x = 484;
-            this.imgPorinter.y = 112;
+            this.imgPorinter.x = 114;
+            this.imgPorinter.y = 75;
             this.imgPorinter.width = 22;
             this.imgPorinter.height = 36;
             //groupClick 
@@ -173,8 +173,8 @@ var modules;
             this.groupAll.addChild(this.groupClick);
             this.groupClick.showBg = false;
             this.groupClick.border = false;
-            this.groupClick.x = 114;
-            this.groupClick.y = 300;
+            this.groupClick.x = 134;
+            this.groupClick.y = 254;
             this.groupClick.width = 412;
             this.groupClick.height = 480;
             this.groupClick.visible = false;
@@ -271,8 +271,7 @@ var modules;
             if (this.spriteSheet)
                 this.imgCont.texture = this.spriteSheet.getTexture("page02-13");
             this.imgCont.drawDelay = false;
-            if (this.spriteSheet)
-                this.imgClick.texture = this.spriteSheet.getTexture("page02-15");
+            this.imgClick.texture = RES.getRes("yellow");
             this.imgClick.drawDelay = false;
             if (this.spriteSheet)
                 this.imgPorinter.texture = this.spriteSheet.getTexture("page02-14");

438_talks_0325_01/bin-debug/modules/view/courseware/index2View.js

@@ -129,10 +129,12 @@ var modules;
         };
         index2View.prototype.onTouchBtnDele = function (event) {
             //TODO 此处填写 btnPage按钮点击逻辑
+            this.ui.imgClick.texture = easy.ResManager.getTexture("yellow");
             this.ui.groupClick.visible = false;
         };
         index2View.prototype.onTouchBtnClick = function (event) {
             //TODO 此处填写 btnPage按钮点击逻辑
+            this.ui.imgClick.texture = easy.ResManager.getTexture("red");
             this.ui.groupClick.visible = true;
         };
         /**

438_talks_0325_01/bin-release/web/200414212652/index.html

@@ -0,0 +1,96 @@
+<!DOCTYPE HTML>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>Egret</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="full-screen" content="true" />
+    <meta name="screen-orientation" content="portrait" />
+    <meta name="x5-fullscreen" content="true" />
+    <meta name="360-fullscreen" content="true" />
+    <style>
+        html, body {
+            -ms-touch-action: none;
+            background: #888888;
+            padding: 0;
+            border: 0;
+            margin: 0;
+            height: 100%;
+        }
+    </style>
+</head>
+
+<body>
+    <div style="margin: auto;width: 100%;height: 100%;" class="egret-player"
+         data-entry-class="Main"
+         data-orientation="auto"
+         data-scale-mode="showAll"
+         data-frame-rate="30"
+         data-content-width="640"
+         data-content-height="1136"
+         data-show-paint-rect="false"
+         data-multi-fingered="2"
+         data-show-fps="false" data-show-log="false"
+         data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
+    </div>
+<script>
+    var loadScript = function (list, callback) {
+        var loaded = 0;
+        var loadNext = function () {
+            loadSingleScript(list[loaded], function () {
+                loaded++;
+                if (loaded >= list.length) {
+                    callback();
+                }
+                else {
+                    loadNext();
+                }
+            })
+        };
+        loadNext();
+    };
+
+    var loadSingleScript = function (src, callback) {
+        var s = document.createElement('script');
+        s.async = false;
+        s.src = src;
+        s.addEventListener('load', function () {
+            s.parentNode.removeChild(s);
+            s.removeEventListener('load', arguments.callee, false);
+            callback();
+        }, false);
+        document.body.appendChild(s);
+    };
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', './manifest.json?v=' + Math.random(), true);
+    xhr.addEventListener("load", function () {
+        var manifest = JSON.parse(xhr.response);
+        var list = manifest.initial.concat(manifest.game);
+        loadScript(list, function () {
+            /**
+             * {
+             * "renderMode":, //Engine rendering mode, "canvas" or "webgl"
+             * "audioType": 0 //Use the audio type, 0: default, 2: web audio, 3: audio
+             * "antialias": //Whether the anti-aliasing is enabled in WebGL mode, true: on, false: off, defaults to false
+             * "calculateCanvasScaleFactor": //a function return canvas scale factor
+             * }
+             **/
+            egret.runEgret({ renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor:function(context) {
+                var backingStore = context.backingStorePixelRatio ||
+                    context.webkitBackingStorePixelRatio ||
+                    context.mozBackingStorePixelRatio ||
+                    context.msBackingStorePixelRatio ||
+                    context.oBackingStorePixelRatio ||
+                    context.backingStorePixelRatio || 1;
+                return (window.devicePixelRatio || 1) / backingStore;
+            }});
+        });
+    });
+    xhr.send(null);
+</script>
+</body>
+
+</html>

438_talks_0325_01/bin-release/web/200414212652/manifest.json

@@ -0,0 +1,13 @@
+{
+	"initial": [
+		"js/egret.min_836d668b.js",
+		"js/egret.web.min_d1451e99.js",
+		"js/game.min_a9c9e7a1.js",
+		"js/tween.min_6c5a88f9.js",
+		"js/assetsmanager.min_2ef412b7.js",
+		"js/promise.min_83a6a5d.js"
+	],
+	"game": [
+		"js/main.min_896ca3b5.js"
+	]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index10_200327143855.json

@@ -0,0 +1,38 @@
+{"texture":
+    {
+        "page05-03":{"x":1198, "y":306, "w":598, "h":696},
+        "page07-12":{"x":0, "y":306, "w":598, "h":494},
+        "page09-02":{"x":599, "y":306, "w":598, "h":654},
+        "page03-01":{"x":702, "y":0, "w":154, "h":21},
+        "page03-02":{"x":214, "y":0, "w":487, "h":21},
+        "page05-01":{"x":1206, "y":28, "w":580, "h":44},
+        "page06-01":{"x":0, "y":28, "w":588, "h":36},
+        "page08-01":{"x":624, "y":28, "w":581, "h":43},
+        "page07-09":{"x":865, "y":73, "w":466, "h":51},
+        "page09-01":{"x":0, "y":73, "w":596, "h":44},
+        "page05-02":{"x":1155, "y":0, "w":112, "h":26},
+        "page07-10":{"x":478, "y":202, "w":585, "h":103},
+        "page07-11":{"x":1661, "y":0, "w":321, "h":27},
+        "page05-04":{"x":1332, "y":73, "w":207, "h":62},
+        "page06-02":{"x":1540, "y":73, "w":223, "h":62},
+        "page07-13":{"x":0, "y":0, "w":71, "h":20},
+        "page08-04":{"x":956, "y":0, "w":99, "h":24},
+        "page09-03":{"x":1268, "y":0, "w":392, "h":27},
+        "page05-06":{"x":0, "y":136, "w":207, "h":62},
+        "page06-04":{"x":416, "y":136, "w":223, "h":62},
+        "page07-14":{"x":143, "y":0, "w":70, "h":20},
+        "page08-05":{"x":857, "y":0, "w":98, "h":24},
+        "page09-04":{"x":1117, "y":136, "w":477, "h":65},
+        "page05-08":{"x":208, "y":136, "w":207, "h":62},
+        "page06-06":{"x":1764, "y":73, "w":223, "h":62},
+        "page07-15":{"x":72, "y":0, "w":70, "h":20},
+        "page08-06":{"x":1056, "y":0, "w":98, "h":24},
+        "page09-05":{"x":0, "y":202, "w":477, "h":65},
+        "page09-06":{"x":640, "y":136, "w":476, "h":65},
+        "page09-07":{"x":1064, "y":202, "w":476, "h":103},
+        "kuang":{"x":589, "y":28, "w":34, "h":36},
+        "page04-15":{"x":731, "y":73, "w":133, "h":47},
+        "page02-11":{"x":597, "y":73, "w":133, "h":47}
+    },
+    "group":"index10"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index10_loader_200327143855.json

@@ -0,0 +1,11 @@
+{
+"resources":[
+    {"name":"index10_img","type":"image","url":"assets/ui/courseware/index10_200327143855.png"},
+    {"name":"index10_json","type":"json","url":"assets/ui/courseware/index10_200327143855.json"},
+    {"name":"10","type":"image","url":"assets/ui/courseware/10.jpg?ver=200327143855"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200327143855"}
+],
+"groups":[
+    {"name":"courseware_index10","keys":"index10_img,index10_json,10,page08-03"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index11_200408220949.json

@@ -0,0 +1,13 @@
+{"texture":
+    {
+        "page9-02":{"x":741, "y":118, "w":742, "h":802},
+        "page03-01":{"x":0, "y":0, "w":154, "h":21},
+        "page03-02":{"x":155, "y":0, "w":487, "h":21},
+        "page10-02":{"x":1366, "y":0, "w":97, "h":117},
+        "page10-03":{"x":941, "y":0, "w":424, "h":97},
+        "page10-04":{"x":0, "y":118, "w":740, "h":170},
+        "page10-05":{"x":777, "y":0, "w":163, "h":80},
+        "page10-06":{"x":643, "y":0, "w":133, "h":47}
+    },
+    "group":"index11"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index11_loader_200408220949.json

@@ -0,0 +1,10 @@
+{
+"resources":[
+    {"name":"index11_img","type":"image","url":"assets/ui/courseware/index11_200408220949.png"},
+    {"name":"index11_json","type":"json","url":"assets/ui/courseware/index11_200408220949.json"},
+    {"name":"11","type":"image","url":"assets/ui/courseware/11.jpg?ver=200408220949"}
+],
+"groups":[
+    {"name":"courseware_index11","keys":"index11_img,index11_json,11"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index1_200330222915.json

@@ -0,0 +1,12 @@
+{"texture":
+    {
+        "1":{"x":272, "y":410, "w":742, "h":1136},
+        "page1-01":{"x":139, "y":0, "w":565, "h":125},
+        "page01-01":{"x":705, "y":0, "w":570, "h":125},
+        "page1-02":{"x":1276, "y":0, "w":638, "h":409},
+        "page01-03":{"x":0, "y":410, "w":271, "h":626},
+        "page01-04":{"x":49, "y":0, "w":89, "h":107},
+        "slide":{"x":0, "y":0, "w":48, "h":48}
+    },
+    "group":"index1"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index1_loader_200330222915.json

@@ -0,0 +1,9 @@
+{
+"resources":[
+    {"name":"index1_img","type":"image","url":"assets/ui/courseware/index1_200330222915.png"},
+    {"name":"index1_json","type":"json","url":"assets/ui/courseware/index1_200330222915.json"}
+],
+"groups":[
+    {"name":"courseware_index1","keys":"index1_img,index1_json"}
+]
+}

438_talks_0325_01/resource/assets/ui/courseware/index2_200409212819.json → 438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index2_200414212206.json

@@ -2,12 +2,11 @@
     {
         "page02-01":{"x":501, "y":0, "w":102, "h":51},
         "page02-02":{"x":191, "y":0, "w":309, "h":50},
-        "page_2_4":{"x":817, "y":0, "w":21, "h":155},
-        "page_2_5":{"x":1252, "y":0, "w":21, "h":487},
-        "page02-13":{"x":1274, "y":0, "w":574, "h":626},
-        "page02-15":{"x":604, "y":0, "w":212, "h":68},
+        "page_2_4":{"x":604, "y":0, "w":21, "h":155},
+        "page_2_5":{"x":1615, "y":0, "w":21, "h":487},
+        "page02-13":{"x":626, "y":0, "w":575, "h":453},
         "page02-14":{"x":34, "y":0, "w":22, "h":36},
-        "page02-16":{"x":839, "y":0, "w":412, "h":480},
+        "page02-16":{"x":1202, "y":0, "w":412, "h":480},
         "page02-17":{"x":0, "y":0, "w":33, "h":25},
         "page02-11":{"x":57, "y":0, "w":133, "h":47}
     },

438_talks_0325_01/resource/assets/ui/courseware/index2_loader_200409212819.json → 438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index2_loader_200414212206.json

@@ -1,13 +1,13 @@
 {
 "resources":[
-    {"name":"index2_img","type":"image","url":"assets/ui/courseware/index2_200409212819.png"},
-    {"name":"index2_json","type":"json","url":"assets/ui/courseware/index2_200409212819.json"},
-    {"name":"2","type":"image","url":"assets/ui/courseware/2.jpg?ver=200409212819"},
-    {"name":"page02-12","type":"image","url":"assets/ui/courseware/page02-12.png?ver=200409212819"},
-    {"name":"red","type":"image","url":"assets/ui/courseware/red.png?ver=200409212819"},
-    {"name":"yellow","type":"image","url":"assets/ui/courseware/yellow.png?ver=200409212819"}
+    {"name":"index2_img","type":"image","url":"assets/ui/courseware/index2_200414212206.png"},
+    {"name":"index2_json","type":"json","url":"assets/ui/courseware/index2_200414212206.json"},
+    {"name":"2","type":"image","url":"assets/ui/courseware/2.jpg?ver=200414212206"},
+    {"name":"yellow","type":"image","url":"assets/ui/courseware/yellow.png?ver=200414212206"},
+    {"name":"page02-12","type":"image","url":"assets/ui/courseware/page02-12.png?ver=200414212206"},
+    {"name":"red","type":"image","url":"assets/ui/courseware/red.png?ver=200414212206"}
 ],
 "groups":[
-    {"name":"courseware_index2","keys":"index2_img,index2_json,2,page02-12,red,yellow"}
+    {"name":"courseware_index2","keys":"index2_img,index2_json,2,yellow,page02-12,red"}
 ]
 }

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index3_200409211855.json

@@ -0,0 +1,17 @@
+{"texture":
+    {
+        "page03-10":{"x":399, "y":190, "w":598, "h":714},
+        "page03-01":{"x":488, "y":0, "w":154, "h":21},
+        "page03-02":{"x":0, "y":0, "w":487, "h":21},
+        "page03-03":{"x":643, "y":0, "w":470, "h":46},
+        "page03-04":{"x":0, "y":190, "w":152, "h":189},
+        "page03-05":{"x":1562, "y":0, "w":146, "h":188},
+        "page03-06":{"x":1407, "y":0, "w":154, "h":186},
+        "page03-07":{"x":1248, "y":0, "w":158, "h":160},
+        "page03-08":{"x":153, "y":190, "w":122, "h":445},
+        "page03-09":{"x":276, "y":190, "w":122, "h":446},
+        "page03-11":{"x":1709, "y":0, "w":260, "h":189},
+        "page02-11":{"x":1114, "y":0, "w":133, "h":47}
+    },
+    "group":"index3"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index3_loader_200409211855.json

@@ -0,0 +1,12 @@
+{
+"resources":[
+    {"name":"index3_img","type":"image","url":"assets/ui/courseware/index3_200409211855.png"},
+    {"name":"index3_json","type":"json","url":"assets/ui/courseware/index3_200409211855.json"},
+    {"name":"3","type":"image","url":"assets/ui/courseware/3.jpg?ver=200409211855"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200409211855"},
+    {"name":"page02-12","type":"image","url":"assets/ui/courseware/page02-12.png?ver=200409211855"}
+],
+"groups":[
+    {"name":"courseware_index3","keys":"index3_img,index3_json,3,page08-03,page02-12"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index4_200409214122.json

@@ -0,0 +1,40 @@
+{"texture":
+    {
+        "page03-01":{"x":0, "y":0, "w":154, "h":21},
+        "page03-02":{"x":155, "y":0, "w":487, "h":21},
+        "page04-02":{"x":0, "y":48, "w":361, "h":49},
+        "page04-03":{"x":781, "y":0, "w":321, "h":27},
+        "page04-04":{"x":1335, "y":0, "w":231, "h":46},
+        "page04-05":{"x":1103, "y":0, "w":231, "h":46},
+        "page04-06":{"x":1050, "y":48, "w":274, "h":59},
+        "page04-07":{"x":1600, "y":48, "w":274, "h":60},
+        "page04-08":{"x":275, "y":109, "w":274, "h":60},
+        "page04-09":{"x":500, "y":48, "w":274, "h":59},
+        "page04-10":{"x":0, "y":109, "w":274, "h":60},
+        "page04-11":{"x":1325, "y":48, "w":274, "h":59},
+        "page04-12":{"x":825, "y":109, "w":274, "h":60},
+        "page04-13":{"x":550, "y":109, "w":274, "h":60},
+        "page04-14":{"x":775, "y":48, "w":274, "h":59},
+        "type1_1":{"x":1100, "y":109, "w":68, "h":100},
+        "type1_2":{"x":643, "y":0, "w":68, "h":24},
+        "type1_3":{"x":431, "y":48, "w":68, "h":55},
+        "type1_4":{"x":1307, "y":109, "w":67, "h":132},
+        "type1_5":{"x":1513, "y":109, "w":68, "h":209},
+        "type1_6":{"x":1651, "y":109, "w":68, "h":285},
+        "type1_7":{"x":1789, "y":109, "w":68, "h":361},
+        "type1_8":{"x":1927, "y":109, "w":68, "h":438},
+        "type1_9":{"x":0, "y":548, "w":68, "h":514},
+        "type2_1":{"x":1858, "y":109, "w":68, "h":408},
+        "type2_2":{"x":1720, "y":109, "w":68, "h":332},
+        "type2_3":{"x":1582, "y":109, "w":68, "h":255},
+        "type2_4":{"x":1375, "y":109, "w":68, "h":179},
+        "type2_5":{"x":1169, "y":109, "w":68, "h":102},
+        "type2_6":{"x":712, "y":0, "w":68, "h":26},
+        "type2_7":{"x":362, "y":48, "w":68, "h":52},
+        "type2_8":{"x":1238, "y":109, "w":68, "h":129},
+        "type2_9":{"x":1444, "y":109, "w":68, "h":205},
+        "page04-15":{"x":1701, "y":0, "w":133, "h":47},
+        "page02-11":{"x":1567, "y":0, "w":133, "h":47}
+    },
+    "group":"index4"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index4_loader_200409214122.json

@@ -0,0 +1,12 @@
+{
+"resources":[
+    {"name":"index4_img","type":"image","url":"assets/ui/courseware/index4_200409214122.png"},
+    {"name":"index4_json","type":"json","url":"assets/ui/courseware/index4_200409214122.json"},
+    {"name":"4","type":"image","url":"assets/ui/courseware/4.jpg?ver=200409214122"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200409214122"},
+    {"name":"page02-12","type":"image","url":"assets/ui/courseware/page02-12.png?ver=200409214122"}
+],
+"groups":[
+    {"name":"courseware_index4","keys":"index4_img,index4_json,4,page08-03,page02-12"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index5_200327130441.json

@@ -0,0 +1,27 @@
+{"texture":
+    {
+        "page05-03":{"x":832, "y":126, "w":598, "h":696},
+        "page03-01":{"x":0, "y":0, "w":154, "h":21},
+        "page03-02":{"x":155, "y":0, "w":487, "h":21},
+        "page05-01":{"x":791, "y":0, "w":580, "h":44},
+        "page05-02":{"x":643, "y":0, "w":112, "h":26},
+        "page05-04":{"x":0, "y":63, "w":207, "h":62},
+        "page05-06":{"x":1640, "y":0, "w":207, "h":62},
+        "page05-08":{"x":624, "y":63, "w":207, "h":62},
+        "page05-10":{"x":624, "y":126, "w":207, "h":63},
+        "page05-12":{"x":208, "y":63, "w":207, "h":62},
+        "page05-14":{"x":416, "y":63, "w":207, "h":62},
+        "page05-16":{"x":1456, "y":63, "w":207, "h":62},
+        "page05-05":{"x":832, "y":63, "w":207, "h":62},
+        "page05-07":{"x":1040, "y":63, "w":207, "h":62},
+        "page05-09":{"x":1248, "y":63, "w":207, "h":62},
+        "page05-11":{"x":416, "y":126, "w":207, "h":63},
+        "page05-13":{"x":1664, "y":63, "w":207, "h":62},
+        "page05-15":{"x":0, "y":126, "w":207, "h":62},
+        "page05-17":{"x":208, "y":126, "w":207, "h":62},
+        "kuang":{"x":756, "y":0, "w":34, "h":36},
+        "page04-15":{"x":1372, "y":0, "w":133, "h":47},
+        "page02-11":{"x":1506, "y":0, "w":133, "h":47}
+    },
+    "group":"index5"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index5_loader_200327130441.json

@@ -0,0 +1,11 @@
+{
+"resources":[
+    {"name":"index5_img","type":"image","url":"assets/ui/courseware/index5_200327130441.png"},
+    {"name":"index5_json","type":"json","url":"assets/ui/courseware/index5_200327130441.json"},
+    {"name":"5","type":"image","url":"assets/ui/courseware/5.jpg?ver=200327130441"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200327130441"}
+],
+"groups":[
+    {"name":"courseware_index5","keys":"index5_img,index5_json,5,page08-03"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index6_200327132324.json

@@ -0,0 +1,42 @@
+{"texture":
+    {
+        "page05-03":{"x":432, "y":235, "w":598, "h":696},
+        "page03-01":{"x":0, "y":0, "w":154, "h":21},
+        "page03-02":{"x":155, "y":0, "w":487, "h":21},
+        "page05-01":{"x":1380, "y":0, "w":580, "h":44},
+        "page06-01":{"x":756, "y":0, "w":588, "h":36},
+        "page05-02":{"x":643, "y":0, "w":112, "h":26},
+        "page05-04":{"x":268, "y":45, "w":207, "h":62},
+        "page06-02":{"x":1296, "y":108, "w":223, "h":62},
+        "page05-06":{"x":684, "y":45, "w":207, "h":62},
+        "page06-04":{"x":1520, "y":108, "w":223, "h":62},
+        "page05-08":{"x":1100, "y":45, "w":207, "h":62},
+        "page06-06":{"x":848, "y":108, "w":223, "h":62},
+        "page05-10":{"x":224, "y":235, "w":207, "h":63},
+        "page06-08":{"x":1776, "y":171, "w":223, "h":63},
+        "page05-12":{"x":416, "y":108, "w":207, "h":62},
+        "page06-10":{"x":1072, "y":108, "w":223, "h":62},
+        "page05-14":{"x":0, "y":108, "w":207, "h":62},
+        "page06-12":{"x":624, "y":108, "w":223, "h":62},
+        "page05-16":{"x":892, "y":45, "w":207, "h":62},
+        "page06-14":{"x":672, "y":171, "w":223, "h":62},
+        "page05-05":{"x":1308, "y":45, "w":207, "h":62},
+        "page06-03":{"x":224, "y":171, "w":223, "h":62},
+        "page05-07":{"x":476, "y":45, "w":207, "h":62},
+        "page06-05":{"x":1120, "y":171, "w":223, "h":62},
+        "page05-09":{"x":208, "y":108, "w":207, "h":62},
+        "page06-07":{"x":0, "y":171, "w":223, "h":62},
+        "page05-11":{"x":1568, "y":171, "w":207, "h":63},
+        "page06-09":{"x":0, "y":235, "w":223, "h":63},
+        "page05-13":{"x":1744, "y":108, "w":207, "h":62},
+        "page06-11":{"x":896, "y":171, "w":223, "h":62},
+        "page05-15":{"x":1724, "y":45, "w":207, "h":62},
+        "page06-13":{"x":1344, "y":171, "w":223, "h":62},
+        "page05-17":{"x":1516, "y":45, "w":207, "h":62},
+        "page06-15":{"x":448, "y":171, "w":223, "h":62},
+        "kuang":{"x":1345, "y":0, "w":34, "h":36},
+        "page04-15":{"x":0, "y":45, "w":133, "h":47},
+        "page02-11":{"x":134, "y":45, "w":133, "h":47}
+    },
+    "group":"index6"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index6_loader_200327132324.json

@@ -0,0 +1,11 @@
+{
+"resources":[
+    {"name":"index6_img","type":"image","url":"assets/ui/courseware/index6_200327132324.png"},
+    {"name":"index6_json","type":"json","url":"assets/ui/courseware/index6_200327132324.json"},
+    {"name":"6","type":"image","url":"assets/ui/courseware/6.jpg?ver=200327132324"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200327132324"}
+],
+"groups":[
+    {"name":"courseware_index6","keys":"index6_img,index6_json,6,page08-03"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index7_200327133421.json

@@ -0,0 +1,22 @@
+{"texture":
+    {
+        "page02-01":{"x":1104, "y":0, "w":102, "h":51},
+        "page02-02":{"x":794, "y":0, "w":309, "h":50},
+        "page07-01":{"x":169, "y":0, "w":490, "h":40},
+        "page07-02":{"x":0, "y":0, "w":168, "h":27},
+        "page_2_4":{"x":917, "y":132, "w":21, "h":155},
+        "page_2_5":{"x":490, "y":368, "w":21, "h":487},
+        "page02-06":{"x":939, "y":132, "w":210, "h":183},
+        "page07-03":{"x":1150, "y":132, "w":486, "h":235},
+        "page02-07":{"x":0, "y":368, "w":489, "h":408},
+        "page02-08":{"x":0, "y":66, "w":457, "h":65},
+        "page07-05":{"x":900, "y":66, "w":458, "h":65},
+        "page02-09":{"x":1207, "y":0, "w":456, "h":65},
+        "page07-06":{"x":458, "y":132, "w":458, "h":65},
+        "page02-10":{"x":0, "y":132, "w":457, "h":65},
+        "page07-07":{"x":1359, "y":66, "w":457, "h":65},
+        "page07-08":{"x":458, "y":66, "w":441, "h":65},
+        "page02-11":{"x":660, "y":0, "w":133, "h":47}
+    },
+    "group":"index7"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index7_loader_200327133421.json

@@ -0,0 +1,11 @@
+{
+"resources":[
+    {"name":"index7_img","type":"image","url":"assets/ui/courseware/index7_200327133421.png"},
+    {"name":"index7_json","type":"json","url":"assets/ui/courseware/index7_200327133421.json"},
+    {"name":"7","type":"image","url":"assets/ui/courseware/7.jpg?ver=200327133421"},
+    {"name":"page02-12","type":"image","url":"assets/ui/courseware/page02-12.png?ver=200327133421"}
+],
+"groups":[
+    {"name":"courseware_index7","keys":"index7_img,index7_json,7,page02-12"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index8_200327141400.json

@@ -0,0 +1,28 @@
+{"texture":
+    {
+        "page05-03":{"x":599, "y":193, "w":598, "h":696},
+        "page07-12":{"x":0, "y":193, "w":598, "h":494},
+        "page03-01":{"x":702, "y":0, "w":154, "h":21},
+        "page03-02":{"x":214, "y":0, "w":487, "h":21},
+        "page05-01":{"x":582, "y":37, "w":580, "h":44},
+        "page06-01":{"x":1292, "y":0, "w":588, "h":36},
+        "page08-01":{"x":0, "y":37, "w":581, "h":43},
+        "page07-09":{"x":1431, "y":37, "w":466, "h":51},
+        "page05-02":{"x":857, "y":0, "w":112, "h":26},
+        "page07-10":{"x":1296, "y":89, "w":585, "h":103},
+        "page07-11":{"x":970, "y":0, "w":321, "h":27},
+        "page05-04":{"x":208, "y":89, "w":207, "h":62},
+        "page06-02":{"x":1072, "y":89, "w":223, "h":62},
+        "page07-13":{"x":0, "y":0, "w":71, "h":20},
+        "page05-06":{"x":0, "y":89, "w":207, "h":62},
+        "page06-04":{"x":416, "y":89, "w":223, "h":62},
+        "page07-14":{"x":143, "y":0, "w":70, "h":20},
+        "page05-08":{"x":864, "y":89, "w":207, "h":62},
+        "page06-06":{"x":640, "y":89, "w":223, "h":62},
+        "page07-15":{"x":72, "y":0, "w":70, "h":20},
+        "kuang":{"x":1881, "y":0, "w":34, "h":36},
+        "page04-15":{"x":1163, "y":37, "w":133, "h":47},
+        "page02-11":{"x":1297, "y":37, "w":133, "h":47}
+    },
+    "group":"index8"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index8_loader_200327141400.json

@@ -0,0 +1,11 @@
+{
+"resources":[
+    {"name":"index8_img","type":"image","url":"assets/ui/courseware/index8_200327141400.png"},
+    {"name":"index8_json","type":"json","url":"assets/ui/courseware/index8_200327141400.json"},
+    {"name":"8","type":"image","url":"assets/ui/courseware/8.jpg?ver=200327141400"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200327141400"}
+],
+"groups":[
+    {"name":"courseware_index8","keys":"index8_img,index8_json,8,page08-03"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index9_200327142647.json

@@ -0,0 +1,32 @@
+{"texture":
+    {
+        "page05-03":{"x":0, "y":643, "w":598, "h":696},
+        "page07-12":{"x":1179, "y":148, "w":598, "h":494},
+        "page03-01":{"x":214, "y":0, "w":154, "h":21},
+        "page03-02":{"x":369, "y":0, "w":487, "h":21},
+        "page05-01":{"x":1171, "y":37, "w":580, "h":44},
+        "page06-01":{"x":0, "y":37, "w":588, "h":36},
+        "page08-01":{"x":589, "y":37, "w":581, "h":43},
+        "page07-09":{"x":134, "y":85, "w":466, "h":51},
+        "page05-02":{"x":1155, "y":0, "w":112, "h":26},
+        "page07-10":{"x":0, "y":148, "w":585, "h":103},
+        "page08-02":{"x":586, "y":148, "w":592, "h":141},
+        "page07-11":{"x":1268, "y":0, "w":321, "h":27},
+        "page05-04":{"x":1273, "y":85, "w":207, "h":62},
+        "page06-02":{"x":1049, "y":85, "w":223, "h":62},
+        "page07-13":{"x":0, "y":0, "w":71, "h":20},
+        "page08-04":{"x":956, "y":0, "w":99, "h":24},
+        "page05-06":{"x":1481, "y":85, "w":207, "h":62},
+        "page06-04":{"x":601, "y":85, "w":223, "h":62},
+        "page07-14":{"x":143, "y":0, "w":70, "h":20},
+        "page08-05":{"x":1056, "y":0, "w":98, "h":24},
+        "page05-08":{"x":1689, "y":85, "w":207, "h":62},
+        "page06-06":{"x":825, "y":85, "w":223, "h":62},
+        "page07-15":{"x":72, "y":0, "w":70, "h":20},
+        "page08-06":{"x":857, "y":0, "w":98, "h":24},
+        "kuang":{"x":1590, "y":0, "w":34, "h":36},
+        "page04-15":{"x":0, "y":85, "w":133, "h":47},
+        "page02-11":{"x":1752, "y":37, "w":133, "h":47}
+    },
+    "group":"index9"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/index9_loader_200327142647.json

@@ -0,0 +1,11 @@
+{
+"resources":[
+    {"name":"index9_img","type":"image","url":"assets/ui/courseware/index9_200327142647.png"},
+    {"name":"index9_json","type":"json","url":"assets/ui/courseware/index9_200327142647.json"},
+    {"name":"9","type":"image","url":"assets/ui/courseware/9.jpg?ver=200327142647"},
+    {"name":"page08-03","type":"image","url":"assets/ui/courseware/page08-03.png?ver=200327142647"}
+],
+"groups":[
+    {"name":"courseware_index9","keys":"index9_img,index9_json,9,page08-03"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/loading_200326193731.json

@@ -0,0 +1,6 @@
+{"texture":
+    {
+        "page01-01":{"x":0, "y":0, "w":569, "h":125}
+    },
+    "group":"loading"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/temp_200327150518.json

@@ -0,0 +1,7 @@
+{"texture":
+    {
+        "pause":{"x":0, "y":0, "w":58, "h":58},
+        "play":{"x":59, "y":0, "w":58, "h":58}
+    },
+    "group":"temp"
+}

438_talks_0325_01/bin-release/web/200414212652/resource/assets/ui/courseware/temp_loader_200327150518.json

@@ -0,0 +1,9 @@
+{
+"resources":[
+    {"name":"temp_img","type":"image","url":"assets/ui/courseware/temp_200327150518.png"},
+    {"name":"temp_json","type":"json","url":"assets/ui/courseware/temp_200327150518.json"}
+],
+"groups":[
+    {"name":"courseware_temp","keys":"temp_img,temp_json"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/easygame_config.json

@@ -0,0 +1,30 @@
+{
+  "name":"438_talks_0325_01",
+  "product":"modules",
+  "version":"0.0.1",
+  "version_res":"200414212206",
+  "desc":"可自行加入其它配置信息,信息内容自行读取",
+  "report":{
+    "desc":"报表设置,name:渠道的名称,rate:汇率,unit:货币单位,storage:存储(local/net)",
+    "url":"http://www.easygame.org/",
+    "provide":1,
+    "channel":[
+      {"id":1, "app_id":"", "name":"easygame", "rate":1, "unit":"元", "storage":"local", "report":false}
+    ]
+  },
+  "dev":{
+    "desc":"开发模式设置,scale_mode:适配方式,debug:debug开关,loading_max:并发下载最大限制",
+    "scale_mode":"easygame",
+    "debug":"false",
+	"loading_max":5
+  },
+  "resource":"resource/",
+  "resource2":"resource2/",
+  "statistics":{
+    "view":false,
+    "win":false,
+    "btn":false,
+    "mc":false,
+    "list":false
+  }
+}

438_talks_0325_01/bin-release/web/200414212652/resource/loading_main.json

@@ -0,0 +1,9 @@
+{
+"resources":[
+    {"name":"loading_img","type":"image","url":"assets/ui/courseware/loading_200326193731.png"},
+    {"name":"loading_json","type":"json","url":"assets/ui/courseware/loading_200326193731.json"}
+],
+"groups":[
+    {"name":"loading_main","keys":"loading_img,loading_json"}
+]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/loading_view.json

@@ -0,0 +1,11 @@
+{
+"resources":
+	[
+		{"name":"loading_view","type":"image","url":"assets/loading/loading_view.png"}
+	],
+
+"groups":
+	[
+        {"name":"loading_view","keys":"loading_view"}
+	]
+}

438_talks_0325_01/bin-release/web/200414212652/resource/resource.json

@@ -0,0 +1,14 @@
+{
+"resources":
+	[
+        {"name":"easygame_config","type":"json","url":"easygame_config.json"},
+        {"name":"sound_bg","type":"sound","soundType":"music","url":"assets/sound/bg.mp3"},
+        {"name":"sound_button","type":"sound","soundType":"effect","url":"assets/sound/button.mp3"}
+	],
+
+"groups":
+	[
+        {"name":"sound","keys":"sound_bg,sound_button"},
+        {"name":"group_easygame_config","keys":"easygame_config"}
+	]
+}

438_talks_0325_01/easy_game/easy_ui/courseware/index2.xml

@@ -53,25 +53,25 @@
         <property name="showBg" value="false" type="boolean"/>
         <property name="border" value="false" type="boolean"/>
         <property name="x" value="46" type="number"/>
-        <property name="y" value="167" type="number"/>
+        <property name="y" value="247" type="number"/>
         <property name="width" value="574" type="number"/>
         <property name="height" value="626" type="number"/>
         <window name="imgCont" desc="" type="com.easyegret.ui.Image" template="false">
           <property name="texture" value="D:\baiwei0317\20200325_01\page02-13.png" type="bitmapdata"/>
-          <property name="width" value="574" type="number"/>
-          <property name="height" value="626" type="number"/>
+          <property name="width" value="575" type="number"/>
+          <property name="height" value="453" type="number"/>
         </window>
         <window name="imgClick" desc="" type="com.easyegret.ui.Image" template="false">
-          <property name="texture" value="D:\baiwei0317\20200325_01\page02-15.png" type="bitmapdata"/>
-          <property name="x" value="307" type="number"/>
-          <property name="y" value="92" type="number"/>
-          <property name="width" value="212" type="number"/>
-          <property name="height" value="68" type="number"/>
+          <property name="texture" value="D:\baiwei0317\20200325_01\yellow.png" type="bitmapdata"/>
+          <property name="x" value="7" type="number"/>
+          <property name="y" value="32" type="number"/>
+          <property name="width" value="132" type="number"/>
+          <property name="height" value="62" type="number"/>
         </window>
         <window name="imgPorinter" desc="" type="com.easyegret.ui.Image" template="false">
           <property name="texture" value="D:\baiwei0317\20200325_01\page02-14.png" type="bitmapdata"/>
-          <property name="x" value="484" type="number"/>
-          <property name="y" value="112" type="number"/>
+          <property name="x" value="114" type="number"/>
+          <property name="y" value="75" type="number"/>
           <property name="width" value="22" type="number"/>
           <property name="height" value="36" type="number"/>
         </window>
@@ -79,8 +79,8 @@
       <window name="groupClick" desc="" type="com.easyegret.ui.Group" template="false">
         <property name="showBg" value="false" type="boolean"/>
         <property name="border" value="false" type="boolean"/>
-        <property name="x" value="114" type="number"/>
-        <property name="y" value="300" type="number"/>
+        <property name="x" value="134" type="number"/>
+        <property name="y" value="254" type="number"/>
         <property name="width" value="412" type="number"/>
         <property name="height" value="480" type="number"/>
         <property name="visible" value="false" type="boolean"/>

438_talks_0325_01/resource/assets/ui/courseware/index2_200414212206.json

@@ -0,0 +1,14 @@
+{"texture":
+    {
+        "page02-01":{"x":501, "y":0, "w":102, "h":51},
+        "page02-02":{"x":191, "y":0, "w":309, "h":50},
+        "page_2_4":{"x":604, "y":0, "w":21, "h":155},
+        "page_2_5":{"x":1615, "y":0, "w":21, "h":487},
+        "page02-13":{"x":626, "y":0, "w":575, "h":453},
+        "page02-14":{"x":34, "y":0, "w":22, "h":36},
+        "page02-16":{"x":1202, "y":0, "w":412, "h":480},
+        "page02-17":{"x":0, "y":0, "w":33, "h":25},
+        "page02-11":{"x":57, "y":0, "w":133, "h":47}
+    },
+    "group":"index2"
+}

438_talks_0325_01/resource/assets/ui/courseware/index2_loader_200414212206.json

@@ -0,0 +1,13 @@
+{
+"resources":[
+    {"name":"index2_img","type":"image","url":"assets/ui/courseware/index2_200414212206.png"},
+    {"name":"index2_json","type":"json","url":"assets/ui/courseware/index2_200414212206.json"},
+    {"name":"2","type":"image","url":"assets/ui/courseware/2.jpg?ver=200414212206"},
+    {"name":"yellow","type":"image","url":"assets/ui/courseware/yellow.png?ver=200414212206"},
+    {"name":"page02-12","type":"image","url":"assets/ui/courseware/page02-12.png?ver=200414212206"},
+    {"name":"red","type":"image","url":"assets/ui/courseware/red.png?ver=200414212206"}
+],
+"groups":[
+    {"name":"courseware_index2","keys":"index2_img,index2_json,2,yellow,page02-12,red"}
+]
+}

438_talks_0325_01/resource/easygame_config.json

@@ -2,7 +2,7 @@
   "name":"438_talks_0325_01",
   "product":"modules",
   "version":"0.0.1",
-  "version_res":"200409214122",
+  "version_res":"200414212206",
   "desc":"可自行加入其它配置信息,信息内容自行读取",
   "report":{
     "desc":"报表设置,name:渠道的名称,rate:汇率,unit:货币单位,storage:存储(local/net)",

438_talks_0325_01/src/modules/view/courseware/index2.ts

@@ -28,15 +28,15 @@ module modules{
 
     /**
      * <p></p>
-     * @date  :2020-04-09 21:28:19
+     * @date  :2020-04-14 21:22:06
      * @EasyGame.org Tools
      */ 
     export class index2  extends easy.Group{
         public resourceRoot:string = "";
         public resSpriteSheet:string = "index2";//合并材质资源名称
-        public resTexture:Array<string> = ["2","page02-12","red","yellow"];//单材质资源名称
+        public resTexture:Array<string> = ["2","yellow","page02-12","red"];//单材质资源名称
         public resGroup:Array<string> = ["courseware_index2"];//配置文件的Group
-        public resFiles:Array<string> = ["courseware/index2_loader_200409212819.json"];//需要下载的资源group
+        public resFiles:Array<string> = ["courseware/index2_loader_200414212206.json"];//需要下载的资源group
         public spriteSheet:egret.SpriteSheet = null;//ui对应的材质集,已经分割好,方便外部读取方便
 
         public group:easy.Group = null;
@@ -132,29 +132,29 @@ module modules{
             this.groupCont.showBg = false;
             this.groupCont.border = false;
             this.groupCont.x = 46;
-            this.groupCont.y = 167;
+            this.groupCont.y = 247;
             this.groupCont.width = 574;
             this.groupCont.height = 626;
             //imgCont 
             this.imgCont = new easy.Image(true);
             this.imgCont.name = "imgCont";
             this.groupCont.addChild(this.imgCont);
-            this.imgCont.width = 574;
-            this.imgCont.height = 626;
+            this.imgCont.width = 575;
+            this.imgCont.height = 453;
             //imgClick 
             this.imgClick = new easy.Image(true);
             this.imgClick.name = "imgClick";
             this.groupCont.addChild(this.imgClick);
-            this.imgClick.x = 307;
-            this.imgClick.y = 92;
-            this.imgClick.width = 212;
-            this.imgClick.height = 68;
+            this.imgClick.x = 7;
+            this.imgClick.y = 32;
+            this.imgClick.width = 132;
+            this.imgClick.height = 62;
             //imgPorinter 
             this.imgPorinter = new easy.Image(true);
             this.imgPorinter.name = "imgPorinter";
             this.groupCont.addChild(this.imgPorinter);
-            this.imgPorinter.x = 484;
-            this.imgPorinter.y = 112;
+            this.imgPorinter.x = 114;
+            this.imgPorinter.y = 75;
             this.imgPorinter.width = 22;
             this.imgPorinter.height = 36;
             //groupClick 
@@ -163,8 +163,8 @@ module modules{
             this.groupAll.addChild(this.groupClick);
             this.groupClick.showBg = false;
             this.groupClick.border = false;
-            this.groupClick.x = 114;
-            this.groupClick.y = 300;
+            this.groupClick.x = 134;
+            this.groupClick.y = 254;
             this.groupClick.width = 412;
             this.groupClick.height = 480;
             this.groupClick.visible = false;
@@ -258,7 +258,7 @@ module modules{
             this.groupCont.drawDelay = false;
             if (this.spriteSheet) this.imgCont.texture = this.spriteSheet.getTexture("page02-13");
             this.imgCont.drawDelay = false;
-            if (this.spriteSheet) this.imgClick.texture = this.spriteSheet.getTexture("page02-15");
+            this.imgClick.texture = RES.getRes("yellow");
             this.imgClick.drawDelay = false;
             if (this.spriteSheet) this.imgPorinter.texture = this.spriteSheet.getTexture("page02-14");
             this.imgPorinter.drawDelay = false;

438_talks_0325_01/src/modules/view/courseware/index2View.ts

@@ -122,11 +122,13 @@ module modules{
         }
         private onTouchBtnDele(event:egret.TouchEvent):void {
             //TODO 此处填写 btnPage按钮点击逻辑
+            this.ui.imgClick.texture=easy.ResManager.getTexture("yellow")
             this.ui.groupClick.visible = false;
         }
 
         private onTouchBtnClick(event:egret.TouchEvent):void {
             //TODO 此处填写 btnPage按钮点击逻辑
+            this.ui.imgClick.texture=easy.ResManager.getTexture("red")
             this.ui.groupClick.visible = true;
         }
         /**

a.txt

@@ -1 +1 @@
-ss
+sss