Просмотр исходного кода

Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

# Conflicts:
#	assets/script/game/module/hotUpdate.meta
kaka 5 лет назад
Родитель
Сommit
09fbf8bc1c

Разница между файлами не показана из-за своего большого размера
+ 260 - 125
assets/resources/game/prefab/game.prefab


+ 1 - 1
assets/resources/module/cashNormal/cashNormal.prefab

@@ -1568,7 +1568,7 @@
     "_enabled": true,
     "alignMode": 1,
     "_target": {
-      "__id__": 1
+      "__id__": 2
     },
     "_alignFlags": 5,
     "_left": 0,

+ 12 - 0
assets/resources/module/hotUpdate.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "27ca9321-290b-4769-b0e6-bd95cdf80996",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 12 - 0
assets/resources/module/hotUpdate/perfab.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "e45f4d0f-7aa3-4f6e-a64f-6b9bcde71855",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 0 - 2
assets/script/before/GamePlay.ts

@@ -3,9 +3,7 @@ import { PROPTYPE, CHECKDIR, SURPRISETASKTYPE } from "./data/Enum";
 import PoolMgr, { NODEPOOLPREFABTYPE } from "./mgr/PoolMgr";
 import GameConst from "./data/GameConst";
 import GameLogic from "./util/GameLogic";
-import ArtNum from "./util/common/ArtNum";
 import BonusTip from "./view/effect/BonusTip";
-import PlayerConst from "./data/PlayerConst";
 import DataMgr from "./mgr/DataMgr";
 import EffectMgr, { TIP_SPRITEITEM_TYPE } from "./mgr/EffectMgr";
 import GameMgr, { UI_NAME } from "./mgr/GameMgr";

+ 0 - 5
assets/script/before/data/PlayerConst.ts

@@ -1,8 +1,3 @@
-import DataMgr from "../mgr/DataMgr";
-import StorageMgr from "../mgr/StorageMgr";
-import Util from "../util/Util";
-import { PROPTYPE } from "./Enum";
-
 const { ccclass, property } = cc._decorator;
 
 @ccclass

+ 0 - 58
assets/script/before/view/GetUI.ts

@@ -1,58 +0,0 @@
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class GetUI extends cc.Component {
-
-    @property(cc.Node)
-    public node_rectBg: cc.Node = null;
-    @property(cc.Sprite)
-    public spr_icon: cc.Sprite = null;
-    @property(cc.Label)
-    public label_name: cc.Label = null;
-    @property(cc.Node)
-    public node_getBtn: cc.Node = null;
-
-    // LIFE-CYCLE CALLBACKS:
-
-    // onLoad () {}
-
-    start() {
-        this.node_rectBg.setContentSize(cc.winSize.width, cc.winSize.height);
-        this.node_getBtn.on(cc.Node.EventType.TOUCH_END, this.onClickGetBtn, this);
-    }
-
-    // update (dt) {}
-
-    /**初始化
-     * @param url 
-     * @param name 
-     * @param num  数量
-     * @param multipleNum 倍数
-     */
-    init(url: string, name: string, num: number, multipleNum: number = 1) {
-
-        mk.loader.load(url,cc.SpriteFrame).then((spriteFrame)=>{
-           this.spr_icon.spriteFrame = spriteFrame;
-        })
-
-        if (multipleNum == 1) {
-            this.label_name.string = ` ${name} x${num}`;
-        }
-        else {
-            // this.label_name.string = ` ${name} ${num} * ${multipleNum}`;
-            this.label_name.string = ` ${name} x${multipleNum}`;
-        }
-
-        // x${num}
-    }
-
-    onClickGetBtn() {
-        
-        //AudioMgr.Inst.playEffect(AUDIO_CLIP_NAME.buttonClick);
-        mk.audio.playEffect("button");
-
-        // this.node.active = false;
-        mk.ui.closePanel("GetUI")
-    }
-}

+ 0 - 201
assets/script/before/view/PlayerInfoUI.ts

@@ -1,201 +0,0 @@
-import { EVENT_TYPE } from "../../game/data/GameData";
-import GameConst from "../data/GameConst";
-import PlayerConst from "../data/PlayerConst";
-import GameMgr, { UI_NAME } from "../mgr/GameMgr";
-import GameLogic from "../util/GameLogic";
-import Util from "../util/Util";
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class PlayerInfoUI extends cc.Component {
-
-    @property(cc.Node)
-    node_rectBg: cc.Node = null;
-
-    @property(cc.Node)
-    node_closeBtn: cc.Node = null;
-
-    @property(cc.Sprite)
-    spr_head: cc.Sprite = null;
-    @property(cc.Label)
-    label_nickName: cc.Label = null;
-
-    @property(cc.Label)
-    label_inviteCode: cc.Label = null;
-    @property(cc.Node)
-    node_copyInviteCodeBtn: cc.Node = null;
-    @property(cc.Node)
-    node_inputInviteCodeBtn: cc.Node = null;
-
-    @property(cc.Label)
-    label_cashNum: cc.Label = null;
-    @property(cc.Node)
-    node_caseOutBtn: cc.Node = null;
-
-    @property(cc.Node)
-    node_inviteBtn: cc.Node = null;
-
-    @property(cc.Node)
-    node_serviceBookBtn: cc.Node = null;
-    @property(cc.Node)
-    node_privacyRuleBtn: cc.Node = null;
-    @property(cc.Node)
-    node_gameRuleBtn: cc.Node = null;
-    @property(cc.Node)
-    node_contactBtn: cc.Node = null;
-
-    @property(cc.Node)
-    node_serviceBookUI: cc.Node = null;
-    @property(cc.Node)
-    node_privacyRuleUI: cc.Node = null;
-    @property(cc.Node)
-    node_gameRuleUI: cc.Node = null;
-    @property(cc.Node)
-    node_contactUI: cc.Node = null;
-
-    @property(cc.Label)
-    label_version: cc.Label = null;
-
-    // LIFE-CYCLE CALLBACKS:
-
-    // onLoad () {}
-
-    start() {
-        this.addapt();
-        this.initView();
-        this.initEvent();
-    }
-
-    // update (dt) {}
-
-    onEnable() {
-
-        GameMgr.Inst.sendEvent(UI_NAME.PlayerInfoUI, "进入玩家信息界面");
-
-        // //显示广告
-        // AdMgr.Inst.showNativeAd(4, true);
-
-        this.initCaseNum();
-        this.initHead();
-        this.initNickName();
-    }
-
-    onDisable() {
-        // //显示广告
-        // AdMgr.Inst.destroyNativeAd();
-    }
-
-    addapt() {
-        this.node_rectBg.setContentSize(cc.winSize.width, cc.winSize.height);
-    }
-
-    initView() {
-        this.initHead();
-        this.initNickName();
-        this.initInviteCode();
-        this.label_version.string = `v${GameConst.appVersion}`;
-    }
-
-    initEvent() {
-        this.node_closeBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_copyInviteCodeBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_inputInviteCodeBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_caseOutBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_inviteBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_serviceBookBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_privacyRuleBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_gameRuleBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-        this.node_contactBtn.on(cc.Node.EventType.TOUCH_END, this.onClick, this);
-
-        if (!GameConst.isAuth) {
-            mk.event.register(EVENT_TYPE.BACK_WxAuth, this.onWxAuthBack, this);
-        }
-    }
-
-    onClick(event: cc.Event.EventTouch) {
-        // AudioMgr.Inst.playEffect(AUDIO_CLIP_NAME.buttonClick);
-        mk.audio.playEffect("button");
-        switch (event.currentTarget) {
-            case this.node_closeBtn:
-                this.onClickCloseBtn();
-                break;
-            case this.node_copyInviteCodeBtn:
-                this.onClickCopyInviteCodeBtn();
-                break;
-            case this.node_inviteBtn:
-                this.onClickInviteBtn();
-                break;
-            case this.node_serviceBookBtn:
-                this.onClickServiceBookBtn();
-                break;
-            case this.node_privacyRuleBtn:
-                this.onClickPrivacyRuleBtn();
-                break;
-            case this.node_gameRuleBtn:
-                this.onClickGameRuleBtn();
-                break;
-            case this.node_contactBtn:
-                this.onClickContactBtn();
-                break;
-        }
-    }
-
-    initHead() {
-        GameLogic.loadHeadImg("" + "?aaa=aa.jpg", this.spr_head, 95);
-    }
-
-    initNickName() {
-        this.label_nickName.string = "PlayerConst.nickName";
-    }
-
-    initInviteCode() {
-        this.label_inviteCode.string = Util.cutStr(GameConst.uin, 8);
-    }
-
-    initCaseNum() {
-        // let num = Util.numberFixed(PlayerConst.cashNum, 2);
-        // this.label_cashNum.string = `¥ ${num}`;
-    }
-
-    onClickCloseBtn() {
-        GameMgr.Inst.sendEvent(UI_NAME.PlayerInfoUI, "点击关闭按钮");
-        // this.node.active = false;
-
-        mk.ui.closePanel("PlayerInfoUI")
-    }
-
-    onClickCopyInviteCodeBtn() {
-
-    }
-
-    onClickInviteBtn() {
-
-    }
-
-    onClickServiceBookBtn() {
-        this.node_serviceBookUI.active = true;
-    }
-
-    onClickPrivacyRuleBtn() {
-        this.node_privacyRuleUI.active = true;
-    }
-
-    onClickGameRuleBtn() {
-        this.node_gameRuleBtn.active = true;
-    }
-
-    onClickContactBtn() {
-        // GameMgr.Inst.sendEvent(UI_NAME.PlayerInfoUI, "点击提现按钮");
-        this.node_contactBtn.active = true;
-    }
-
-    //自定义事件------------------------------------------------------------------------
-    /**微信授权返回 */
-    onWxAuthBack() {
-        this.initHead();
-        this.initNickName();
-        mk.event.remove(EVENT_TYPE.BACK_WxAuth, this.onWxAuthBack, this);
-    }
-
-}

+ 0 - 9
assets/script/before/view/PlayerInfoUI.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.0.8",
-  "uuid": "d20bea2b-1775-4612-82d4-b9f040a42b3b",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

+ 6 - 0
assets/script/game/data/RedPointData.ts

@@ -0,0 +1,6 @@
+/**
+ * 红点数据
+ * @author 薛鸿潇
+ */
+export default class RedPointData extends cc.Component {
+}

+ 1 - 1
assets/script/before/view/GetUI.ts.meta → assets/script/game/data/RedPointData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "4d3c2f59-60ea-4cb1-a37a-c3a489ad86aa",
+  "uuid": "996c3973-5e93-406e-b879-eb2875d7e2f2",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

+ 1 - 1
assets/script/game/module/hotUpdate.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "738afd6f-7553-45b4-98ca-f4480a5f41f1",
+  "uuid": "6ab0dcf5-b307-420f-ab3a-88befa72e960",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


Разница между файлами не показана из-за своего большого размера
+ 242 - 378
build/jsb-link/js backups (useful for debugging)/main.index.js


BIN
keystore/eliminate.keystore


+ 16 - 0
keystore/eliminate签名信息.txt

@@ -0,0 +1,16 @@
+别名: eliminate_1
+创建日期: 2021-6-10
+条目类型: PrivateKeyEntry
+证书链长度: 1
+证书[1]:
+所有者: CN=umeng, OU=develop, O=moka, L=suzhou, ST=jiangsu, C=cn
+发布者: CN=umeng, OU=develop, O=moka, L=suzhou, ST=jiangsu, C=cn
+序列号: 38a1e994
+有效期为 Thu Jun 10 14:08:27 CST 2021 至 Wed Sep 08 14:08:27 CST 2021
+证书指纹:
+         MD5:  8D:18:32:56:9C:3A:F6:AD:52:99:34:D9:37:38:CD:AE
+         SHA1: 17:86:F0:35:19:F8:72:31:A5:6F:91:F7:DD:92:50:32:0D:52:E9:1E
+         SHA256: 9E:23:84:B2:95:62:EF:C0:75:07:6F:B1:80:67:BF:BB:3F:18:73:E0:32:39:BD:44:57:6F:F7:C1:C5:69:B2:21
+签名算法名称: SHA256withRSA
+主体公共密钥算法: 2048 位 RSA 密钥
+版本: 3

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

@@ -7,7 +7,7 @@
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/"
     ],
-    "buildTime": 1624779710933,
-    "genTime": 1624779710933,
+    "buildTime": 1624784411216,
+    "genTime": 1624784411216,
     "genVersion": null
 }

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