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

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "64032a87-13a2-414a-a91f-a4bed7cc56a9",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/game/coregame/coregame.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 2274
+        "__id__": 2273
       },
       {
         "__id__": 141
       }
     ],
     "_prefab": {
-      "__id__": 2275
+      "__id__": 2274
     },
     "_opacity": 255,
     "_color": {
@@ -286,11 +286,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 2272
+        "__id__": 2271
       }
     ],
     "_prefab": {
-      "__id__": 2273
+      "__id__": 2272
     },
     "_opacity": 255,
     "_color": {
@@ -710,13 +710,9 @@
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 2270
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 2271
+      "__id__": 2270
     },
     "_opacity": 255,
     "_color": {
@@ -81059,16 +81055,6 @@
     "sync": false
   },
   {
-    "__type__": "14e0e1W5WZAabGMU4MsdUCs",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 18
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/game/prefab/uiPanel/PlantPanel.prefab

@@ -24,17 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 17
       },
       {
-        "__id__": 14
+        "__id__": 18
       },
       {
-        "__id__": 15
+        "__id__": 19
+      },
+      {
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -101,11 +104,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -263,7 +266,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "List",
+    "_name": "滚动视图",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -276,11 +279,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 12
+      },
+      {
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -305,7 +311,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -265,
+        -273.297,
         0,
         0,
         0,
@@ -331,15 +337,43 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "view",
     "_objFlags": 0,
     "_parent": {
       "__id__": 6
     },
+    "_children": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      }
+    ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 11
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 730,
+      "height": 350
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
     },
-    "_name": "PlantItem",
-    "_active": true,
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
@@ -362,18 +396,140 @@
       "y": 0,
       "z": 0
     },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "content",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 730,
+      "height": 350
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -365,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
     "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "6c4cddd9-4029-4d7b-b09d-8cae76051b8c"
+    },
+    "fileId": "b2WHx7mR5MjpXOPLNE6ol0",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
       "__id__": 7
     },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_spriteFrame": null,
+    "_type": 0,
+    "_segments": 64,
+    "_N$alphaThreshold": 0,
+    "_N$inverted": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
     "asset": {
-      "__uuid__": "a28c4e7b-8cd1-4959-a0a4-d6f304ad663f"
+      "__uuid__": "6c4cddd9-4029-4d7b-b09d-8cae76051b8c"
+    },
+    "fileId": "dc96ZjHxRNtpeRxaNxkYOx",
+    "sync": false
+  },
+  {
+    "__type__": "cc.ScrollView",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "horizontal": true,
+    "vertical": false,
+    "inertia": true,
+    "brake": 0.75,
+    "elastic": true,
+    "bounceDuration": 0.23,
+    "scrollEvents": [],
+    "cancelInnerEvents": false,
+    "_N$content": {
+      "__id__": 8
+    },
+    "content": {
+      "__id__": 8
     },
-    "fileId": "e1CW9e/yBHzI67ts539qZW",
-    "sync": true
+    "_N$horizontalScrollBar": null,
+    "_N$verticalScrollBar": null,
+    "_id": ""
   },
   {
     "__type__": "9a31drXM+9NCKYkF9D78zlF",
@@ -384,10 +540,12 @@
     },
     "_enabled": true,
     "pre_item": [
-      null
+      {
+        "__uuid__": "ca279bfd-c7e6-46f5-9731-0a636e046674"
+      }
     ],
     "scr_item": [
-      ""
+      "PlantItem"
     ],
     "itemInterval": 10,
     "node_xiabiao": null,
@@ -402,7 +560,7 @@
     "asset": {
       "__uuid__": "6c4cddd9-4029-4d7b-b09d-8cae76051b8c"
     },
-    "fileId": "967bGTDGtHpqumeao/pKdZ",
+    "fileId": "baFMXigexIdIIfedpycXmp",
     "sync": false
   },
   {
@@ -514,6 +672,19 @@
     "_id": ""
   },
   {
+    "__type__": "afc7c9y+IlK2pswzhp7XL30",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "tableView": {
+      "__id__": 13
+    },
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/setting/texture/title.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 297,
-  "height": 87,
+  "width": 141,
+  "height": 43,
   "platformSettings": {},
   "subMetas": {
     "title": {

assets/script/before/main/FarmCountDown.ts

@@ -1,4 +1,4 @@
-import { BitmapFont } from "../../game/component/BitmapFont";
+import { BitmapFontC } from "../../game/component/BitmapFontC";
 import Util from "../util/Util";
 
 const { ccclass, property } = cc._decorator;
@@ -9,7 +9,7 @@ export class FarmCountDown extends cc.Component {
     @property({ type: cc.Component.EventHandler, tooltip: "加速按钮回调" }) onSpeedButton: cc.Component.EventHandler = null;
     @property({ type: cc.Node, tooltip: "常驻计时器组" }) normalGroup: cc.Node = null;
     @property({ type: cc.ProgressBar, tooltip: "常驻进度条" }) normalProgress: cc.ProgressBar = null;
-    @property({ type: BitmapFont, tooltip: "常驻计时" }) normalCount: BitmapFont = null;
+    @property({ type: BitmapFontC, tooltip: "常驻计时" }) normalCount: BitmapFontC = null;
     @property({ type: cc.Node, tooltip: "可收获图标" }) ripedIcon: cc.Node = null;
 
     // @property({ type: Node, tooltip: "点击计时器组" }) selectGroup: cc.Node = null;
@@ -75,7 +75,7 @@ export class FarmCountDown extends cc.Component {
         // }
         // WindowManager.showTips("钻石不足");
     }
-    
+
     private riped(): void {
         this.counting = false;
         this.normalGroup.active = false;

assets/script/before/main/FarmIcon.ts

@@ -1,4 +1,4 @@
-import { FarmState } from '../../game/data/GameData';
+import { FarmState, ProductType } from '../../game/data/GameData';
 import { MoveToCenter } from '../map/MoveToCenter';
 import { FarmCountDown } from './FarmCountDown';
 import { FarmGrowProcess } from './FarmGrowProcess';
@@ -28,6 +28,7 @@ export class FarmIcon extends cc.Component {
     onLoad() {
         this.configID = this.getComponent(IDHelper).buildID;
         this.sortID = this.getComponent(IDHelper).sortID;
+        gData.farmSystem.addFram(this);
     }
 
     start() {
@@ -114,6 +115,7 @@ export class FarmIcon extends cc.Component {
                 gData.adUnlockData.openPanel(this.configID);
                 break;
             case FarmState.Empty:
+                gData.plantData.openPanel(ProductType.nzw, this.configID);
                 break;
             case FarmState.Growing:
                 break;

assets/script/before/main/FarmSystem.ts

@@ -1,11 +1,12 @@
 
+import { FarmState } from '../../game/data/GameData';
 import Util from '../util/Util';
-import { FarmIcon, FarmState } from './FarmIcon';
+import { FarmIcon } from './FarmIcon';
 import { TouchHelper } from './TouchHelper';
 const { ccclass } = cc._decorator;
 
 @ccclass
-export class FarmSystem extends cc.Component {
+export class FarmSystem {
     public farms: Array<FarmIcon> = [];
     private _currSelectFarm: FarmIcon = null;
     public plantWindowIsOpening = false;

assets/script/before/view/data/PlantData.ts

@@ -0,0 +1,23 @@
+/** 可生产产品列表数据类 */
+
+import { ProductType } from "../../../game/data/GameData";
+
+const { ccclass } = cc._decorator;
+
+@ccclass
+export default class PlantData {
+    tab = null;
+    configID = -1;
+    productArr = [];
+    /**
+     * 打开生产产品界面
+     * @param tab 产品类型
+     * @param configID 生产设备ID
+     */
+    openPanel(tab: ProductType, configID) {
+        this.tab = tab;
+        this.configID = configID;
+        this.productArr = gData.gameData.getProductArrByType(tab);
+        mk.ui.openPanel('game/prefab/uiPanel/PlantPanel');
+    }
+}

assets/script/game/component/BitmapFont.ts.meta → assets/script/before/view/data/PlantData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "a776858a-4e82-453f-8e6b-10c99468e2da",
+  "uuid": "d58da774-eb23-41ca-8fc3-33221ed9e22f",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

assets/script/before/view/ui/PlantPanel.ts

@@ -0,0 +1,29 @@
+/** 可生产产品列表 */
+
+import TableView from "../../../game/component/TableView";
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class PlantPanel extends cc.Component {
+
+    @property({ type: TableView, displayName: '滚动视图' })
+    private tableView: TableView = null!;
+
+    start() {
+        this.initScollView();
+    }
+
+    /**
+     * 初始化滚动视图
+     */
+    private initScollView() {
+        let list_data = gData.plantData.productArr;
+        this.tableView.node.emit('srollview-init', list_data)
+
+        // let index = gData.sign.getItemIndexByCanSign();
+        // if (index > 0)
+        //     index -= 1;
+        // this.tableView.contentMoveByIndex(index, 0.1);
+    }
+}

assets/script/before/view/ui/PlantPanel.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "afc7cf72-f889-4ada-9b30-ce1a7b5cbdf4",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/before/view/uiItem/PlantItem.ts

@@ -0,0 +1,59 @@
+/** 可生产物品item */
+
+import { BitmapFontC } from "../../../game/component/BitmapFontC";
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class PlantItem extends cc.Component {
+
+    @property({ type: cc.Sprite, tooltip: "作物图标" }) plantIcon: cc.Sprite = null;
+    @property({ type: cc.Sprite, tooltip: "名字图标" }) nameIcon: cc.Sprite = null;
+    @property({ type: BitmapFontC, tooltip: "获得数量文本" }) awardLabel: BitmapFontC = null;
+    @property({ type: BitmapFontC, tooltip: "成熟时间文本" }) timeLabel: BitmapFontC = null;
+    @property({ type: cc.Node, tooltip: "未开启遮罩" }) maskNode: cc.Node = null;
+
+    /**
+     * list_data
+     * @param list_data 数据列表
+     */
+    public async setItemData(list_data) {
+        await this.initItem(list_data);
+    }
+
+    /**
+     * 数据分发
+     * @param list_data 数据列表
+     */
+    private async initItem(list_data) {
+        this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + list_data.picture, cc.SpriteFrame);
+        this.nameIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/nameIcon/plant_name_" + list_data.picture, cc.SpriteFrame);
+        this.awardLabel.string = list_data.redBagCoin;
+        this.timeLabel.string = list_data.time;
+        let unlock = false;
+        //根据上个商品种植次数
+        if (list_data.unlock == 1) {
+            let times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
+            if (times >= list_data.value) {
+                unlock = true;
+            }
+        }
+        //根据农场等级
+        else if (list_data.unlock == 2) {
+            if (list_data.value <= gData.gameData.gameData.gradeLevel) {
+                unlock = true;
+            }
+        }
+
+        if (!this.maskNode.active && !unlock) {
+            this.maskNode.active = true;
+        }
+        else {
+            this.maskNode.active = false;
+        }
+    }
+
+    clickMake() {
+
+    }
+}

assets/script/before/view/uiItem/PlantItem.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "257c9cee-9fd1-4ce5-a296-7a1be497a493",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/component/BitmapData.ts

@@ -0,0 +1,12 @@
+const { ccclass, property } = cc._decorator;
+/**
+ * 字符集数据
+ */
+ @ccclass()
+ export class BitmapFontData {
+     @property({ tooltip: "字符" })
+     public chair: string = '';
+     @property({ tooltip: "图片", type: cc.SpriteFrame })
+     public spriteFrame: cc.SpriteFrame = null;
+ 
+ }

assets/script/game/component/BitmapData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "c6dd61c0-c3d9-49bb-9658-6f886638a027",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/component/BitmapFont.ts → assets/script/game/component/BitmapFontC.ts

@@ -1,25 +1,19 @@
+import { BitmapFontData } from "./BitmapData";
+
 const { ccclass, property } = cc._decorator;
-/**
- * 字符集数据
- */
-@ccclass
-export class BitmapFontData {
-    @property({ tooltip: "字符" })
-    public chair: string = '';
-    @property({ tooltip: "图片", type: cc.SpriteFrame })
-    public spriteFrame: cc.SpriteFrame = null;
-}
+
 /**
  * 位图文本
  * @author 袁浩
  */
 @ccclass
-export class BitmapFont extends cc.Component {
-    @property({ tooltip: "字符集配置", type: [BitmapFontData], serializable: false })
-    public dataList: BitmapFontData[] = [];
+export class BitmapFontC extends cc.Component {
+    @property({ tooltip: "字符集配置", type: [cc.SpriteFrame], serializable: true })
+    public dataList: cc.SpriteFrame[] = [];
     @property({ visible: false })
     private _string: string = '';
     @property({ tooltip: "文本内容字符串", serializable: true })
+
     public get string(): string {
         return this._string;
     }
@@ -32,12 +26,12 @@ export class BitmapFont extends cc.Component {
             if (data) {
                 if (child) {
                     child.active = true;
-                    child.getComponent(cc.Sprite).spriteFrame = data.spriteFrame;
+                    child.getComponent(cc.Sprite).spriteFrame = data;
                 }
                 else {
                     let node = new cc.Node(chair)
                     let sprite = node.addComponent(cc.Sprite);
-                    sprite.spriteFrame = data.spriteFrame;
+                    sprite.spriteFrame = data;
                     node.parent = this.node;
                 }
             }
@@ -53,10 +47,14 @@ export class BitmapFont extends cc.Component {
     private getData(chair: string) {
         for (let j = 0; j < this.dataList.length; j++) {
             const data = this.dataList[j];
-            if (data.chair == chair) {
+            if (data.name == chair) {
                 return data;
             }
         }
         return null;
     }
+
+    start() {
+
+    }
 }

assets/script/game/component/BitmapFontC.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "fd855280-3e0f-4c9f-b5a2-e9cbff818cac",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/component/TableView.ts

@@ -134,14 +134,27 @@ export default class TableView extends cc.Component {
         const old_count = this.itemArr.length;
         for (let i = 0; i < old_count; i++) {
             if (this.itemData[i]) {
-                if (!this.itemArr[i]) {
-                    let y = 0;
-                    if (i > 0) {
-                        y = this.itemArr[i - 1].y - this.itemArr[i - 1].height - this.itemInterval;// 下一条目纵坐标
+                if (this.direction == Direction.vertical) {
+                    if (!this.itemArr[i]) {
+                        let y = 0;
+                        if (i > 0) {
+                            y = this.itemArr[i - 1].y - this.itemArr[i - 1].height - this.itemInterval;// 下一条目纵坐标
+                        }
+                        let item_node = this.addItemNode(i, y);
+                        this.updateContentHeigh(this.itemArr[i].height - item_node.y);
                     }
-                    let item_node = this.addItemNode(i, y);
-                    this.updateContentHeigh(this.itemArr[i].height - item_node.y);
                 }
+                else {
+                    if (!this.itemArr[i]) {
+                        let x = 0;
+                        if (i > 0) {
+                            x = this.itemArr[i - 1].x + this.itemArr[i - 1].width + this.itemInterval;// 下一条目纵坐标
+                        }
+                        let item_node = this.addItemNode(i, x);
+                        this.updateContentHeigh(this.itemArr[i].width + item_node.x);
+                    }
+                }
+
                 let comp_script = this.itemArr[i].getComponent(this.scr_item[this.itemData[i].pfbType || 0]);
                 comp_script && comp_script.setItemData(this.itemData[i], this);
             } else {
@@ -175,7 +188,6 @@ export default class TableView extends cc.Component {
         if (this.direction == Direction.vertical) {
             for (let i = index; i < item_data_count; i++) {
                 let obj: any = {}
-                let y;
                 if (i === 0) {
                     obj.startPos = 0;
                 } else {
@@ -189,7 +201,6 @@ export default class TableView extends cc.Component {
         else {
             for (let i = index; i < item_data_count; i++) {
                 let obj: any = {}
-                let y;
                 if (i === 0) {
                     obj.startPos = 0;
                 } else {
@@ -202,7 +213,12 @@ export default class TableView extends cc.Component {
         }
 
         if (item_data_count > 0) {
-            this.updateContentHeigh(this.itemPosMap.get(item_data_count - 1).endPos);
+            if (this.direction == Direction.vertical) {
+                this.updateContentHeigh(this.itemPosMap.get(item_data_count - 1).endPos);
+            }
+            else {
+                this.updateContentWidth(this.itemPosMap.get(item_data_count - 1).endPos);
+            }
         }
     }
 
@@ -352,7 +368,7 @@ export default class TableView extends cc.Component {
             if (this.content.width > this.layerWith) {
                 let firstItemPos = this.scrollView.getScrollOffset().x;
                 let lastItemPos = firstItemPos + this.layerWith;
-                if (firstItemPos < 0) return;
+                if (firstItemPos > 0) return;
                 if (this.initItemData) {
                     // cc.log('111:%o', this.itemPosMap)
                     this.initItemData = false;
@@ -364,13 +380,13 @@ export default class TableView extends cc.Component {
 
                 //超出边界直接返回.
                 //滚动条向上滑动可能会触发的函数
-                if (firstItemPos > this.firstItemData.endPos) {
+                if (firstItemPos < this.firstItemData.endPos) {
                     if (this.lastItemIndex + 1 < this.itemData.length) {
                         this.updateFirstItemIndex();
                     }
                     this.count++;
                 }
-                if (lastItemPos > this.lastItemData.endPos) {
+                if (lastItemPos < this.lastItemData.endPos) {
                     if (this.lastItemIndex + 1 < this.itemData.length) {
                         this.itemCanMoveDown = true;
                         this.updateLastItemIndex();
@@ -378,11 +394,11 @@ export default class TableView extends cc.Component {
                     }
                 }
                 //滚动条向下滑动可能会触发的函数
-                if (lastItemPos < this.lastItemData.startPos) {
+                if (lastItemPos > this.lastItemData.startPos) {
                     this.updateLastItemIndex();
                     this.count--;
                 }
-                if (firstItemPos < this.firstItemData.startPos) {
+                if (firstItemPos > this.firstItemData.startPos) {
                     this.itemCanMoveUp = true;
                     this.updateFirstItemIndex();
                     this.itemCanMoveUp = false;
@@ -415,26 +431,49 @@ export default class TableView extends cc.Component {
      * @returns 
      */
     private getItemIndex() {
-        let firstItemPos = this.scrollView.getScrollOffset().y;
-        let lastItemPos = firstItemPos + this.layerHeight;
         let arr = [];
-        this.itemPosMap.forEach((value, key) => {
-            let status1 = value.startPos <= firstItemPos && value.endPos > firstItemPos;
-            let status2 = value.startPos >= firstItemPos && value.endPos < lastItemPos;
-            let status3 = value.startPos <= lastItemPos && value.endPos > lastItemPos;
-            if (status1) {
-                this.firstItemData.startPos = value.startPos;
-                this.firstItemData.endPos = value.endPos;
-                this.firstItemIndex = key;
-                arr.push(key);
-            }
-            if (status3) {
-                this.lastItemData.startPos = value.startPos;
-                this.lastItemData.endPos = value.endPos;
-                this.lastItemIndex = key;
-                arr.push(key);
-            }
-        })
+        if (this.direction == Direction.vertical) {
+            let firstItemPos = this.scrollView.getScrollOffset().y;
+            let lastItemPos = firstItemPos + this.layerHeight;
+            this.itemPosMap.forEach((value, key) => {
+                let status1 = value.startPos <= firstItemPos && value.endPos > firstItemPos;
+                let status2 = value.startPos >= firstItemPos && value.endPos < lastItemPos;
+                let status3 = value.startPos <= lastItemPos && value.endPos > lastItemPos;
+                if (status1) {
+                    this.firstItemData.startPos = value.startPos;
+                    this.firstItemData.endPos = value.endPos;
+                    this.firstItemIndex = key;
+                    arr.push(key);
+                }
+                if (status3) {
+                    this.lastItemData.startPos = value.startPos;
+                    this.lastItemData.endPos = value.endPos;
+                    this.lastItemIndex = key;
+                    arr.push(key);
+                }
+            })
+        }
+        else {
+            let firstItemPos = this.scrollView.getScrollOffset().x;
+            let lastItemPos = firstItemPos + this.layerWith;
+            this.itemPosMap.forEach((value, key) => {
+                let status1 = value.startPos <= firstItemPos && value.endPos > firstItemPos;
+                let status2 = value.startPos >= firstItemPos && value.endPos < lastItemPos;
+                let status3 = value.startPos <= lastItemPos && value.endPos > lastItemPos;
+                if (status1) {
+                    this.firstItemData.startPos = value.startPos;
+                    this.firstItemData.endPos = value.endPos;
+                    this.firstItemIndex = key;
+                    arr.push(key);
+                }
+                if (status3) {
+                    this.lastItemData.startPos = value.startPos;
+                    this.lastItemData.endPos = value.endPos;
+                    this.lastItemIndex = key;
+                    arr.push(key);
+                }
+            })
+        }
         return arr;
     }
 
@@ -448,7 +487,12 @@ export default class TableView extends cc.Component {
             return;
         }
         if (!this.hasItem(num)) {
-            this.itemMove(num, -this.itemPosMap.get(num).startPos);
+            if (this.direction == Direction.vertical) {
+                this.itemMove(num, -this.itemPosMap.get(num).startPos);
+            }
+            else {
+                this.itemMove(num, this.itemPosMap.get(num).startPos);
+            }
         }
         num++;
         return this.itemMoveUp(num);
@@ -460,7 +504,12 @@ export default class TableView extends cc.Component {
             return;
         }
         if (!this.hasItem(num)) {
-            this.itemMove(num, -this.itemPosMap.get(num).startPos);
+            if (this.direction == Direction.vertical) {
+                this.itemMove(num, -this.itemPosMap.get(num).startPos);
+            }
+            else {
+                this.itemMove(num, this.itemPosMap.get(num).startPos);
+            }
         }
         num--;
         return this.itemMoveDown(num);
@@ -487,7 +536,7 @@ export default class TableView extends cc.Component {
      * @param y 
      * @returns 
      */
-    private itemMove(index: number, y: number) {
+    private itemMove(index: number, xOrY: number) {
         for (let i = 0; i < this.itemArr.length; i++) {
             //index存在-1的情况,类似于在缓存池里的item.
             let status1 = this.itemArr[i].index < this.firstItemIndex - 1 ? true : false;
@@ -498,13 +547,18 @@ export default class TableView extends cc.Component {
                 //cc.log(i, index, this.itemArr, this.content.height);
                 //给item赋值还有设置位置
                 this.itemArr[i].index = index;
-                this.itemArr[i].y = y;
+                if (this.direction == Direction.vertical) {
+                    this.itemArr[i].y = xOrY;
+                }
+                else {
+                    this.itemArr[i].x = xOrY;
+                }
                 let comp_script = this.itemArr[i].getComponent(this.scr_item[this.itemArr[i].pfbType]);
                 comp_script && comp_script.setItemData(this.itemData[index], this);
                 return;
             }
         }
-        this.addItemNode(index, y);
+        this.addItemNode(index, xOrY);
     }
 
     /**

assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -89,7 +89,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     break;
                 case EffectType.bottomIn:
                     this.effect_par.active = true;
-                    this.effect_par.y = -(1334 / 2);
+                    this.effect_par.y = -(cc.winSize.height / 2);
                     let toY = this.effect_par.y + this.effect_par.height;
                     cc.tween(this.effect_par)
                         .to(0.3, { y: toY }, cc.easeBackInOut())
@@ -149,7 +149,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     //     .start()
                     break;
                 case EffectType.bottomIn:
-                    let toY = -(1334 / 2);
+                    let toY = -(cc.winSize.height / 2);
                     cc.tween(this.effect_par)
                         .to(0.3, { y: toY }, cc.easeOut(3))
                         .call(() => {

assets/script/game/data/AdData.ts

@@ -185,7 +185,11 @@ export class AdData {
 
     /** 设置关闭红包弹出全屏插屏序列 */
     setFullInterShowStr() {
-        let fullInterShowStrArr = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(';');
+        let fullInterShowStrArr = [];
+        if (gData.gameData.configs.GlobalCfg.fullInterShowStrArr) {
+            fullInterShowStrArr = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(';');
+        }
+
         for (var i = 0; i < fullInterShowStrArr.length; i++) {
             let tempArr = fullInterShowStrArr[i].split(',');
             if (gData.gameData.adShowConfig.average_ecpm <= tempArr[1]) {

assets/script/game/data/GData.ts

@@ -26,6 +26,8 @@ import GuideWeakData from "./module/GuideWeakData";
 import { ConfigData } from "./ConfigData";
 import { NewCashUIData } from "./module/NewCashUIData";
 import ADUnlockData from "../../before/view/data/ADUnlockData";
+import PlantData from "../../before/view/data/PlantData";
+import { FarmSystem } from "../../before/main/FarmSystem";
 
 /**
  * 数据集合全局类
@@ -76,6 +78,8 @@ class GData {
 
     public newCashUiData: NewCashUIData;
     public adUnlockData: ADUnlockData;
+    public plantData: PlantData;
+    public farmSystem: FarmSystem;
 
     public moduleData: Map<number, Data>;
 
@@ -109,6 +113,9 @@ class GData {
         this.redeem = new RedeemData();
         this.newCashUiData = new NewCashUIData();
         this.adUnlockData = new ADUnlockData();
+        this.plantData = new PlantData();
+
+        this.farmSystem = new FarmSystem();
 
         this.moduleData = new Map<number, Data>();
         this.moduleData.set(Fun.moreGame, this.moreGame);

assets/script/game/data/GameData.ts

@@ -65,6 +65,9 @@ export class GameData {
         mk.console.logSingle("getAllConfigInfo", response.data);
         this.initConfigs(response.data);
 
+        //初始化topon
+        mk.ad.init();
+
         data = {};
         response = await mk.http.sendData('getInfoCrypt', data);
         if (response.errcode != 0) {
@@ -87,6 +90,8 @@ export class GameData {
         this.adShowConfig = response.data;
         mk.console.logSingle("user/adShowConfig", response.data);
 
+        gData.adData.setFullInterShowStr();
+
         this.dataFinish = true;
     }
 
@@ -96,6 +101,7 @@ export class GameData {
         this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
 
         // this.setProductMapFromJson();
+        gData.configData.loadConfig();
     }
 
     /**
@@ -300,6 +306,7 @@ export class GameData {
     /** 服务器数据设置到本地 */
     public setFramDataMapByServer() {
         let len = this._farmData.length;
+        //新玩家初始化农田数据
         if (len <= 18) {
             let id = 31000;
             let data = null;
@@ -328,8 +335,10 @@ export class GameData {
     }
 
 
-    /** puduct配置数据 */
+    /** puduct配置数据 <picture, config> */
     private _productMap: Map<number, any> = new Map();
+    /** puduct类型配置数据 <tab, 类型数组> */
+    private _productTypeMap: Map<string, any> = new Map();
     /** 设置puduct配置数据 */
     public setProductMapFromJson() {
         // let productJson = this.configs.product;
@@ -340,12 +349,65 @@ export class GameData {
         for (var i = 0; i < len; i++) {
             product = productJson[i];
             this._productMap.set(product['picture'], product);
+            let arr = [];
+            if (this.getProductArrByType(product['tab'])) {
+                arr = this.getProductArrByType(product['tab']);
+            }
+            else {
+                this._productTypeMap.set(product['tab'], arr);
+            }
+            arr.push(product);
         }
     }
 
+    /** 根据id获取单个数据 */
     public getProductMap(id) {
         return this._productMap.get(id);
     }
+
+    /** 根据tab获取数组 */
+    public getProductArrByType(type: ProductType) {
+        return this._productTypeMap.get(type);
+    }
+
+    /** 产品生产/种植次数 服务器数据 */
+    private _productMakeTimesData = [];
+    /** 产品生产/种植次数 */
+    private _productMakeTimesMap: Map<number, number> = new Map();
+
+    addProductMakeTimesById(id: number) {
+        let times = this._productMakeTimesMap.get(id);
+        if (!times) {
+            times = 0;
+        }
+        times++;
+        this._productMakeTimesMap.set(id, times);
+
+        //更新到服务器
+        let has = false;
+        let len = this._productMakeTimesData.length;
+        for (var i = 0; i < len; i++) {
+            if (this._productMakeTimesData[i].id == id) {
+                this._productMakeTimesData[i].times = times;
+                has = true;
+                break;
+            }
+        }
+        if (!has) {
+            let data = { 'id': id, 'times': times };
+            this._productMakeTimesData.push(data);
+        }
+
+        this.setProp(GameProp.productMakeTimes, this._productMakeTimesData);
+    }
+
+    getProductMakeTimesById(id: number) {
+        let times = this._productMakeTimesMap.get(id);
+        if (!times) {
+            times = 0
+        }
+        return times;
+    }
 }
 
 /**
@@ -372,7 +434,8 @@ export enum GameProp {
 
     /** 农田数据 */
     farmData = 11,
-
+    /** 产品生产次数 */
+    productMakeTimes = 12,
 
 
     /** ------------------ 转盘数据 ------------------------------ */
@@ -686,4 +749,14 @@ export enum FarmState {
     Empty,
     Growing,
     Ripe
+}
+
+export enum ProductType {
+    nzw = '农作物',
+    dw = '动物',
+    bmhc = '爆米花厂',
+    gdp = '糕点铺',
+    ztc = '制糖厂',
+    gfmg = '功夫面馆',
+    kcd = '快餐店'
 }

assets/script/game/game/Game.ts

@@ -58,6 +58,7 @@ export default class Game extends cc.Component {
     onLoad() {
         gData.gameData.gameStyle = this;
         mk.ui.closePanel("login");
+        this.loadMain();
     }
 
     start() {
@@ -95,8 +96,14 @@ export default class Game extends cc.Component {
         // }, 3)
     }
 
+    async loadMain() {
+        let mainNode = cc.find('Canvas/主容器');
+        let coreGame = await mk.loader.load('game/coregame/coregame', cc.Prefab);
+        mainNode.addChild(cc.instantiate(coreGame));
+    }
+
     update() {
-        if(gData.gameData.updatePiggyBankValue){
+        if (gData.gameData.updatePiggyBankValue) {
             this.updatePiggyBankValue();
             gData.gameData.updatePiggyBankValue = false;
 
@@ -166,7 +173,7 @@ export default class Game extends cc.Component {
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
     }
 
-    private updatePiggyBankValue(){
+    private updatePiggyBankValue() {
         this.lbl_rmb.string = (gData.gameData.gameData.piggyBank / 100).toFixed(2);
         gData.gameData.updatePiggyBankValue = false;
     }

assets/script/game/module/login/Login.ts

@@ -88,9 +88,10 @@ export default class Login extends cc.Component {
                 }
                 else {
                     mk.ui.openPanel("game/prefab/game");
-                    this.loadMain();
                     console.log("===[Jsbsystem 显示开屏广告================================")
-                    JsbSystem.showSplash();
+                    if (mk.ad.ifShowAd) {
+                        JsbSystem.showSplash();
+                    }
                 }
 
                 gData.gameData.dataFinish = false;
@@ -101,11 +102,6 @@ export default class Login extends cc.Component {
         }
     }
 
-    async loadMain() {
-        let mainNode = cc.find('Canvas/主容器');
-        let coreGame = await mk.loader.load('game/coregame/coregame', cc.Prefab);
-        mainNode.addChild(cc.instantiate(coreGame));
-    }
     /** 设置进度 */
     private setProgress(current) {
         this.bar.setProgress(current);

assets/script/game/module/sign/Sign.ts

@@ -42,10 +42,10 @@ export default class Sign extends cc.Component {
         this.scroll_view.node.emit('srollview-init', list_data)
         this.tableview = this.scroll_view.node.getComponent('TableView')
 
-        let index = gData.sign.getItemIndexByCanSign();
-        if (index > 0)
-            index -= 1;
-        this.tableview.contentMoveByIndex(index, 0.1);
+        // let index = gData.sign.getItemIndexByCanSign();
+        // if (index > 0)
+        //     index -= 1;
+        // this.tableview.contentMoveByIndex(index, 0.1);
     }
 
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -66,6 +66,7 @@ export class ATRewardVideo extends zgSingleton {
             this.ifLoadShow = true;
             return;
         }
+        console.log("anythink === 播放广告 showAd ");
         this.ATRewardVideoJS.showAd();
     }
 

assets/script/mk/system/MKSystem.ts

@@ -14,7 +14,6 @@ import EventSystem from "./EventSystem";
 import MathUtil from "../utils/MathUtil";
 import AdSystem from "./AdSystem";
 import JsbSystem from "./JsbSystem";
-import ATSDKMgr from "../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr";
 import AudioSystem from "./AudioSystem";
 import TipSystem from "./TipSystem";
 import PoolSystem from "./PoolSystem";
@@ -25,6 +24,7 @@ import StringUtil from "../utils/StringUtil";
 import SetGray from "../../game/component/SetGray";
 import NumberAnim from "../../game/component/NumberAnim";
 import AliRiskManager from "../sdk/aliRisk/AliRiskManager";
+import ATSDKMgr from "../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr";
 
 /**
  * @description mk系统

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -90,7 +90,7 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />

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

@@ -264,7 +264,7 @@
     <content url="file://$MODULE_DIR$/../../../src">
       <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/gson-2.8.4.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle

@@ -24,7 +24,7 @@ android {
                     // skip the NDK Build step if PROP_NDK_MODE is none
                     targets 'cocos2djs'
                     arguments 'NDK_TOOLCHAIN_VERSION=clang'
-
+                    
                     def module_paths = [project.file("${System.getenv("COCOSCREATOR_HOME")}/resources/.editors/Creator/2.4.5/resources/cocos2d-x"),
                                         project.file("${System.getenv("COCOSCREATOR_HOME")}/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos"),
                                         project.file("${System.getenv("COCOSCREATOR_HOME")}/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external")]
@@ -61,11 +61,11 @@ android {
 
     signingConfigs {
 
-        release {
-            storeFile file(new File('./keystore/mokakey.keystore'))
-            storePassword RELEASE_STORE_PASSWORD
-            keyAlias RELEASE_KEY_ALIAS
-            keyPassword RELEASE_KEY_PASSWORD
+       release {
+           storeFile file(new File('./keystore/mokakey.keystore'))
+           storePassword RELEASE_STORE_PASSWORD
+           keyAlias RELEASE_KEY_ALIAS
+           keyPassword RELEASE_KEY_PASSWORD
         }
     }
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -5,14 +5,12 @@ KS_AID="67132";        //快手appid
 KS_ANAME="EasyEliminate";      //快手appname
 KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="60c17c51e044530ff09f30a3"; //友盟appid
-UM_CHANNEL="ttaxx_juliang"; //友盟渠道
+UM_CHANNEL="oppo"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wx3c0cc2f730c5ad5a"; //微信appid
+WX_APP_ID="wx3c0cc2f730c5ad5a"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u5fc3\u519c\u4e50\u56ed
 PACKAGE_NAME=com.aries.kxnly.mz
 VERSION_NAME=1.0.0
 VERSION_CODE=1
-TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，全屏开屏,banner
-APP_CONFIG_CODE="1.0.0"
-
-
+TOPON="a6078f65457f6f,66b742dd0e502b64d783d9c66a9d30c4,b6078f6a006916,b6078f6ddebed2,b6078f6fe52b70,b6078f72ec4003,b6078f71eed53e,b6078f711d7007"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏
+APP_CONFIG_CODE="1.0.0"

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/kxnly/mz/wxapi/WXEntryActivity.java

@@ -14,6 +14,7 @@ import android.widget.Toast;
 
 //import org.cocos2dx.javascript.thridSdk.ThirdSdkMgr;
 
+
 import com.aries.kxnly.mz.BuildConfig;
 import com.aries.kxnly.mz.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -1,27 +1,27 @@
 /****************************************************************************
- Copyright (c) 2015-2016 Chukong Technologies Inc.
- Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
+Copyright (c) 2015-2016 Chukong Technologies Inc.
+Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ 
+http://www.cocos2d-x.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+****************************************************************************/
 package org.cocos2dx.javascript;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -9,9 +9,6 @@ import android.util.Log;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
-import com.aries.kxnly.mz.BuildConfig;
-import com.aries.kxnly.mz.wxapi.WXEntryActivity;
-
 import org.cocos2dx.javascript.AppActivity;
 import org.cocos2dx.javascript.thirdSdk.ad.SplashAdShowActivity;
 import org.cocos2dx.javascript.thirdSdk.aliRisk.AliRiskManager;
@@ -20,6 +17,8 @@ import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
+import com.aries.kxnly.mz.BuildConfig;
+import com.aries.kxnly.mz.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 
@@ -167,6 +166,7 @@ public class ThirdSdkMgr {
         TDSDKMgr.getInstance().setTAEventUserStr(type, property, value);
     }
 
+
     //系统相关---------------------------------------------------------------------------------------
     /**
      * 复制到剪贴板

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java

@@ -22,6 +22,7 @@ import com.anythink.splashad.api.ATSplashAdListener;
 import com.aries.kxnly.mz.BuildConfig;
 import com.aries.kxnly.mz.R;
 
+
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 
 import java.util.HashMap;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/aliRisk/AliRiskManager.java

@@ -2,7 +2,6 @@ package org.cocos2dx.javascript.thirdSdk.aliRisk;
 
 import android.util.Log;
 
-
 import net.security.device.api.SecurityCode;
 import net.security.device.api.SecurityDevice;
 import net.security.device.api.SecurityInitListener;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -2,7 +2,6 @@ package org.cocos2dx.javascript.thirdSdk.thinkingdata;
 
 import android.util.Log;
 
-
 import org.cocos2dx.javascript.AppActivity;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -45,17 +44,6 @@ public class TDSDKMgr {
         TDSDKMgr.getInstance().setTAEventRegister();
     }
 
-    public void sendSuperRole(){
-        try {
-            JSONObject superProperties = new JSONObject();
-            superProperties.put("device_id", TDInstance.getDeviceId());
-
-            TDInstance.setSuperProperties(superProperties);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
     public void setTAEvent(String eventID, String des) {
         if (this.TDInstance == null) {
             return;
@@ -157,4 +145,15 @@ public class TDSDKMgr {
             }
         }
     }
+
+    public void sendSuperRole(){
+        try {
+            JSONObject superProperties = new JSONObject();
+            superProperties.put("device_id", TDInstance.getDeviceId());
+
+            TDInstance.setSuperProperties(superProperties);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -18,13 +18,13 @@
 # org.gradle.parallel=true
 
 # Android SDK version that will be used as the compile project
-PROP_COMPILE_SDK_VERSION=30
+PROP_COMPILE_SDK_VERSION=29
 
 # Android SDK version that will be used as the earliest version of android this application can run on
 PROP_MIN_SDK_VERSION=21
 
 # Android SDK version that will be used as the latest version of android this application has been tested on
-PROP_TARGET_SDK_VERSION=30
+PROP_TARGET_SDK_VERSION=29
 
 # Android Build Tools version that will be used as the compile project
 PROP_BUILD_TOOLS_VERSION=28.0.3

keystore/eliminate签名信息.txt

@@ -1,16 +0,0 @@
-别名: 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

keystore/mokakey_README.md

@@ -0,0 +1,3 @@
+文件名：mokakey.jks
+别名：mokakey
+密码：szmoka

packages-hot-update/cfg.json

@@ -1,14 +1,14 @@
 {
     "version": "1.0.2",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
-    "resourceRootDir": "D:\\work\\cocos\\mk_framework\\build\\jsb-link",
+    "resourceRootDir": "D:\\mokaszProjects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1629283090243,
-    "genTime": 1629283090243,
+    "buildTime": 1629353288099,
+    "genTime": 1629353288099,
     "genVersion": null
 }