Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/resource/TextureMerger/sharecodepanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png","..\\assets\\shareCodePanel\\shareWxpyqIcon.png","..\\assets\\shareCodePanel\\shareWxIcon.png","..\\assets\\shareCodePanel\\shareQqIcon.png","..\\assets\\shareCodePanel\\shareWeiboIcon.png"]}
\ No newline at end of file

egret/resource/TextureMerger/startpanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["..\\assets\\startpanel2\\startpanel通关条件.png","..\\assets\\startpanel2\\startpanel数量.png","..\\assets\\startpanel2\\startpanel数量 副本 3.png","..\\assets\\startpanel2\\startpanel目标33.png","..\\assets\\startpanel2\\startpanel目标3.png","..\\assets\\startpanel2\\startpanel按钮.png","..\\assets\\startpanel2\\startpanel_icon3.png","..\\assets\\startpanel2\\startpanel_icon2.png","..\\assets\\startpanel2\\startpanel_icon1.png","..\\assets\\startpanel2\\startpanel_icon.png","..\\assets\\startpanel2\\startpanel_ele9.png","..\\assets\\startpanel2\\startpanel_ele8.png","..\\assets\\startpanel2\\startpanel_ele7.png","..\\assets\\startpanel2\\startpanel_ele6.png","..\\assets\\startpanel2\\startpanel_ele5.png","..\\assets\\startpanel2\\startpanel_ele4.png","..\\assets\\startpanel2\\startpanel_ele3.png","..\\assets\\startpanel2\\startpanel_ele2.png","..\\assets\\startpanel2\\startpanel_ele1.png","..\\assets\\startpanel2\\startpanel_ele0.png","..\\assets\\startpanel2\\startpanel_block2.png","..\\assets\\startpanel2\\startpanel_bg2.png","..\\assets\\startpanel2\\startpanel_avatar.png","..\\assets\\startpanel2\\startpanel_ele10.png","..\\assets\\startpanel2\\startpanel_numsbg.png","..\\assets\\startpanel2\\startpanel_ele27.png","..\\assets\\startpanel2\\startpanel_ele26.png","..\\assets\\startpanel2\\startpanel_ele25.png","..\\assets\\startpanel2\\startpanel_ele24.png","..\\assets\\startpanel2\\startpanel_ele23.png","..\\assets\\startpanel2\\startpanel_ele22.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["..\\assets\\startpanel2\\startpanel通关条件.png","..\\assets\\startpanel2\\startpanel数量.png","..\\assets\\startpanel2\\startpanel数量 副本 3.png","..\\assets\\startpanel2\\startpanel目标33.png","..\\assets\\startpanel2\\startpanel目标3.png","..\\assets\\startpanel2\\startpanel按钮.png","..\\assets\\startpanel2\\startpanel_icon3.png","..\\assets\\startpanel2\\startpanel_icon2.png","..\\assets\\startpanel2\\startpanel_icon1.png","..\\assets\\startpanel2\\startpanel_icon.png","..\\assets\\startpanel2\\startpanel_ele9.png","..\\assets\\startpanel2\\startpanel_ele8.png","..\\assets\\startpanel2\\startpanel_ele7.png","..\\assets\\startpanel2\\startpanel_ele6.png","..\\assets\\startpanel2\\startpanel_ele5.png","..\\assets\\startpanel2\\startpanel_ele4.png","..\\assets\\startpanel2\\startpanel_ele3.png","..\\assets\\startpanel2\\startpanel_ele2.png","..\\assets\\startpanel2\\startpanel_ele1.png","..\\assets\\startpanel2\\startpanel_ele0.png","..\\assets\\startpanel2\\startpanel_block2.png","..\\assets\\startpanel2\\startpanel_bg2.png","..\\assets\\startpanel2\\startpanel_avatar.png","..\\assets\\startpanel2\\startpanel_ele10.png","..\\assets\\startpanel2\\startpanel_numsbg.png","..\\assets\\startpanel2\\startpanel_ele27.png","..\\assets\\startpanel2\\startpanel_ele26.png","..\\assets\\startpanel2\\startpanel_ele25.png","..\\assets\\startpanel2\\startpanel_ele24.png","..\\assets\\startpanel2\\startpanel_ele23.png","..\\assets\\startpanel2\\startpanel_ele22.png","..\\assets\\startpanel2\\startpanel_ele34.png"]}
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -81,7 +81,10 @@ export default class MapScene extends Scene {
         }//剩下的就是邀请有礼和刮刮卡了，本身code上有区分
         else if (code.indexOf("12345678") == -1) {  // 邀请有礼
             const dojoin = DataManager.ins.getData('hc_doJoin');
-            if (!dojoin) return;
+            if (!dojoin) {
+                showToast("立即闯关赢现金！")
+                return;
+            }
             NetManager.ins.doHelp((success, res) => {
                 doHelpFlag = true;
                 switch (true) {

egret/src/panels/ShareCodePanel.ts

@@ -255,12 +255,13 @@ function generateCode(callback: Function, channel: CodeChannels, shareCode: stri
  * 复制口令
  */
 function copyPassword(callback: Function, code: string) {
+    if (document.getElementById("kouling")) document.getElementById("kouling").setAttribute("data-clipboard-text", code)
     window["snShare"].passwordShare({
         ele: '#kouling',
         txt: code + "",
         success: function (e) {
             callback(true, e);
-            // console.log(e,e.text)
+            // console.log(e, e.text)
             // alert('复制口令内容:'+e.text,function(){window.location.href='weixin://';});
         },
         error: function (e) {