kaka 4 лет назад
Родитель
Сommit
1cb840417c

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 1 - 1
assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/version.manifest"}
+{"version":"1.0.8","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/version.manifest"}

+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 0;
+    public serverType: number = 1;
 
     public getServerUrl(): string {
         switch (this.serverType) {

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号

+ 1 - 1
build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

BIN
build/jsb-link/assets/main/index.jsc


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 1 - 1
build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/version.manifest"}
+{"version":"1.0.8","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/version.manifest"}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


+ 2 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -187,9 +187,9 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />

+ 49 - 15
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -420,6 +420,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.bannerAdState = 0;
 e.ifLoadShow = !1;
 e.ifWatchEnd = !1;
+e.singleClick = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -462,11 +463,16 @@ e.prototype.onBannerAdShow = function(t, e) {
 this.bannerAdState = i.Show;
 var n = JSON.parse(e);
 gData.adData.updateADLog(7, t, n);
+this.singleClick = !0;
 };
 e.prototype.onBannerAdClick = function(t, e) {
 var n = JSON.parse(e);
 gData.adData.updateADLog(55, t, n);
 mk.data.sendDataEvent(r.DataEventId.ad_click, "banner点击");
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(75, t, n);
+}
 };
 e.prototype.onBannerAdAutoRefresh = function() {};
 e.prototype.onBannerAdAutoRefreshFail = function() {};
@@ -647,6 +653,8 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.interAdType = -1;
 e.interAdState = 0;
 e.ifLoadShow = !1;
+e.singleClick = !1;
+e.singleClickFull = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -710,20 +718,35 @@ gData.adData.updateADLog(e, t);
 e.prototype.onInterstitialAdShow = function(t, e) {
 this.interAdState = i.Show;
 var n = JSON.parse(e), o = 2, a = this.checkPlacementIDType(t);
-0 == a ? o = 2 : 1 == a && (o = 9);
+if (0 == a) {
+o = 2;
+this.singleClick = !0;
+} else if (1 == a) {
+o = 9;
+this.singleClickFull = !0;
+}
 gData.adData.updateADLog(o, t, n);
 };
 e.prototype.onInterstitialAdClick = function(t, e) {
-var n = 52, o = this.checkPlacementIDType(t);
-if (0 == o) {
+var n = 52, o = 72, a = this.checkPlacementIDType(t), i = JSON.parse(e);
+if (0 == a) {
 n = 52;
+o = 72;
 mk.data.sendDataEvent(r.DataEventId.ad_click, "插屏点击");
-} else if (1 == o) {
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(o, t, i);
+}
+} else if (1 == a) {
 n = 56;
+o = 76;
 mk.data.sendDataEvent(r.DataEventId.ad_click, "全屏插屏点击");
+if (this.singleClickFull) {
+this.singleClickFull = !1;
+gData.adData.updateADLog(o, t, i);
 }
-var a = JSON.parse(e);
-gData.adData.updateADLog(n, t, a);
+}
+gData.adData.updateADLog(n, t, i);
 };
 e.prototype.onInterstitialAdClose = function(t, e) {
 this.interAdState = i.Close;
@@ -1041,6 +1064,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.nativeAdType = 4;
 e.nativeAdState = 0;
 e.ifLoadShow = !1;
+e.singleClick = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -1108,11 +1132,16 @@ e.prototype.onNativeAdShow = function(t, e) {
 this.nativeAdState = i.Show;
 var n = JSON.parse(e);
 gData.adData.updateADLog(3, t, n);
+this.singleClick = !0;
 };
 e.prototype.onNativeAdClick = function(t, e) {
 var n = JSON.parse(e);
 gData.adData.updateADLog(53, t, n);
 mk.data.sendDataEvent(r.DataEventId.ad_click, "信息流点击");
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(73, t, n);
+}
 };
 return e;
 }(c.zgSingleton);
@@ -1222,6 +1251,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.reawardAdState = 0;
 e.ifLoadShow = !1;
 e.canGet = !1;
+e.singleClick = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -1273,6 +1303,7 @@ var o = mk.storage.getStorage("ad_videoEcpm");
 o ? o++ : o = 1;
 mk.storage.setStorage("ad_videoEcpm", o);
 o <= 300 && (o <= 50 ? mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + o, n.adsource_price) : o % 10 == 0 && mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + o, n.adsource_price));
+this.singleClick = !0;
 };
 e.prototype.onRewardedVideoAdPlayEnd = function() {};
 e.prototype.onRewardedVideoAdPlayFailed = function(t, e, n) {
@@ -1295,9 +1326,12 @@ e.prototype.onRewardedVideoAdPlayClicked = function(t, e) {
 var n = JSON.parse(e);
 gData.adData.updateADLog(51, t, n);
 mk.data.sendDataEvent(r.DataEventId.ad_click, "激励视频点击");
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(71, t, n);
+}
 };
 e.prototype.onReward = function() {
-console.log("onReward  ");
 this.canGet = !0;
 };
 return e;
@@ -2180,11 +2214,12 @@ case 4:
 mk.ui.openPanel("module/warnTip/WarnTipPanel");
 return !0;
 }
-if (t <= e) {
+if (t < e) {
 var n = Math.ceil((e - t) / 1e3), o = mk.time.formatWithUnit(n);
 mk.tip.pop("当前看视频太频繁了,请" + o + "后再试");
 return !0;
 }
+gData.warnTipData.setSolution(0);
 return !1;
 };
 t.prototype.showBanner = function() {
@@ -7602,7 +7637,6 @@ var t = !1;
 gData.gameData.getProp(r.GameProp.guideToWx) && (t = !0);
 this.btn11.active = gData.guideToWxData.guideToWxSwith && t;
 }
-this.btn11.active = !0;
 };
 e.prototype.update = function() {
 if (gData.redeem.init_btnChange) {
@@ -7676,7 +7710,7 @@ Object.defineProperty(n, "__esModule", {
 value: !0
 });
 n.Fun = void 0;
-var o, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), u = t("./module/HelpData"), p = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), S = t("./module/RedCodeData"), A = t("./module/RedeemData"), w = t("./module/MoreGameData"), k = t("./module/SettingData"), P = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./module/SafeDepositBoxData"), T = t("./module/TipPanelData"), C = t("./module/GuideToWxData"), R = t("./module/WarnTipData"), N = function() {
+var o, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), u = t("./module/HelpData"), p = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), S = t("./module/RedCodeData"), A = t("./module/RedeemData"), w = t("./module/MoreGameData"), k = t("./module/SettingData"), P = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./module/SafeDepositBoxData"), C = t("./module/TipPanelData"), T = t("./module/GuideToWxData"), R = t("./module/WarnTipData"), N = function() {
 function t() {
 this.init();
 }
@@ -7706,8 +7740,8 @@ this.cashPro = new b.default();
 this.redCodeData = new S.default();
 this.redeem = new A.default();
 this.safeDepositBoxData = new I.default();
-this.tipPanelData = new T.default();
-this.guideToWxData = new C.default();
+this.tipPanelData = new C.default();
+this.guideToWxData = new T.default();
 this.warnTipData = new R.default();
 this.moduleData = new Map();
 this.moduleData.set(o.moreGame, this.moreGame);
@@ -11578,7 +11612,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, a = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -12186,7 +12220,7 @@ value: !0
 n.LogTagColor = void 0;
 var a, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -23763,7 +23797,7 @@ this.tipArr = [ "", "<b>您点击广告太频繁了,请降低点击广告频
 }
 t.prototype.setSolution = function(t) {
 if (this.curSolution != t) {
-this.curSolution = t;
+(0 == t || this.curSolution < t) && (this.curSolution = t);
 mk.storage.setStorage("solution", this.curSolution);
 }
 this.curSolution >= 1 && mk.ui.openPanel("module/warnTip/WarnTipPanel");

+ 3 - 3
packages-hot-update/cfg.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.7",
+    "version": "1.0.8",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/",
     "resourceRootDir": "D:\\copy\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
@@ -18,7 +18,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/"
     ],
-    "buildTime": 1633759425604,
-    "genTime": 1633759425604,
+    "buildTime": 1634195079069,
+    "genTime": 1634195079069,
     "genVersion": null
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
packages-hot-update/manifest/project.manifest


+ 1 - 1
packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/version.manifest"}
+{"version":"1.0.8","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/version.manifest"}

BIN
packages-hot-update/versions/ver_1_0.8.zip


Некоторые файлы не были показаны из-за большого количества измененных файлов