1

.idea/workspace.xml

@@ -3,9 +3,19 @@
   <component name="ChangeListManager">
     <list default="true" id="9464afa6-0efb-46c2-9cfd-05475acd81df" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/egret/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/libs/tw/model/common/GameModel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/model/common/GameModel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/egret/src/Panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/TaskPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mock/joyousManor/taskInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/joyousManor/taskInfo.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexUI.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/LandMgr.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/LandMgr.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/ctrls/net/getRule.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/ctrls/net/getRule.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mock/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/mock/config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -81,7 +91,8 @@
       <workItem from="1575511989902" duration="370000" />
       <workItem from="1575512375307" duration="22831000" />
       <workItem from="1575602130550" duration="39482000" />
-      <workItem from="1575855730362" duration="62277000" />
+      <workItem from="1575855730362" duration="63686000" />
+      <workItem from="1576028222753" duration="4125000" />
     </task>
     <servers />
   </component>
@@ -117,10 +128,10 @@
       <screen x="36" y="23" width="1644" height="1027" />
     </state>
     <state x="586" y="160" key="refactoring.ChangeSignatureDialog/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1575965663028" />
-    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1575978457319">
+    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1576032324115">
       <screen x="36" y="23" width="1644" height="1027" />
     </state>
-    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1575978457319" />
+    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1576032324115" />
     <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1575960048181" />
   </component>
 </project>
\ No newline at end of file

egret/libs/tw/enum/NetName.ts

@@ -128,6 +128,7 @@ export enum NetName {
     GET_COUPON_INFO,
     QUERY_RECORDS,
     GET_PROJECTUSERINFO,
+    GET_RULE,
 
     GET_LANDINFO,
     DO_PLANT,

egret/libs/tw/manager/NetManager.ts

@@ -530,10 +530,10 @@ export class NetManager extends ABNetManager {
     /**
      *  获取规则
      */
-    public getRule(callback: Function): void {
+    public getRuleNg(callback: Function): void {
         const net: INetData = {
             name: NetName.GAME_RULE,
-            uri: '/ngapi/getRule',
+            uri: '/ngapi/getRuleNg',
             type: 'post',
             dataType: 'html',
             param: {
@@ -2450,6 +2450,10 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
+    /**
+     * 获得用户信息
+     * @param callback
+     */
     public getProjectUserInfo(callback: Function) {
         const net: INetData = {
             name: NetName.GET_PROJECTUSERINFO,
@@ -2462,6 +2466,22 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
+    /**
+     * 获得规则
+     * @param callback
+     */
+    public getRule(callback: Function) {
+        const net: INetData = {
+            name: NetName.GET_RULE,
+            uri: '/projectx/{projectId}/projectRule.query',
+            type: 'get',
+            dataType: 'json',
+            param: {},
+            callback: callback
+        };
+        this.send(net);
+    }
+
     ///////////////////////////////////////////////////////////////////
 
     //// 工行欢趣庄园

egret/libs/tw/model/common/GameModel.ts

@@ -11,7 +11,7 @@ export class GameModel extends ActivityModel {
         if (DataManager.ins.getRuleData) {
             callback(true);
         } else {
-            NetManager.ins.getRule(callback);
+            NetManager.ins.getRuleNg(callback);
         }
     }
 

egret/src/Main.ts

@@ -14,6 +14,7 @@ import { initstatistics } from "./comm/statistics";
 import { docEvent } from "./comm/DocumentEvent";
 import { Panels, Scenes, Tops } from "./types/Scenes";
 import Bar from "./components/Bar";
+import { NetManager } from "../libs/tw/manager/NetManager";
 
 let MainStage:egret.Stage = null;
 export { MainStage };
@@ -90,6 +91,12 @@ class Main extends eui.UILayer {
         // initstatistics();    // 页面停留时长（接口）
         docEvent(); // document事件（显示，隐藏，重载）
 
+        NetManager.ins.getRule((success, res)=>{
+            if(!success){
+                return;
+            }
+
+        });
         let bar = new Bar();
         this.addChild(bar);
         this.getGameRes().then(() => {

egret/src/Panels/RulePanel/RulePanel.ts

@@ -10,8 +10,6 @@ export default class RulePanel extends Panel {
     public get skinKey() {
         return 'RulePanel'
     }
-
-    // public get groupName() { return 'prize_panel' }
     constructor(data?) {
         super(data);
 
@@ -30,8 +28,7 @@ export default class RulePanel extends Panel {
     }
 
     private initUI(): void {
-        // let rule = DataManager.ins.ajaxElementData.rule;
-        let rule = window['rule'];
+        let rule = DataManager.ins.getData(NetName.GET_RULE).data || '';
         this.ruleLabel.textFlow = new HtmlTextParser().parse(rule);
     }
 }
\ No newline at end of file

egret/src/Panels/TaskPanel.ts

@@ -109,6 +109,7 @@ class TaskItem extends eui.ItemRenderer {
         this.textFood.text = '×' + this.data.spFood1RewardNum;
         this.textWater.text = '×' + this.data.spFood2RewardNum;
 
+        /// TODO 0奖励隐藏的临时低效方案，待优化
         if(this.data.spFood1RewardNum <= 0) {
             this.foodGroup.visible = false;
             this.waterGroup.x = this.foodGroup.x;
@@ -120,8 +121,6 @@ class TaskItem extends eui.ItemRenderer {
     }
 
     private setBtn() {
-        /// TODO 根据需要设置btn监听事件
-
         this.btn_label.text = (this.data.status == 0) ? taskUi[this.data.id].btnLabel : '已领取';
         this.btn_label.textColor = (this.data.status == 0) ? 0xffffff : 0x9a9a9a;
         this.btn_bg.visible = (this.data.status == 0);

egret/src/Panels/WareHousePanel.ts

@@ -105,13 +105,27 @@ export default class WareHousePanel extends Panel {
     }
 
     private getWareHouseInfo() {
-        /// TODO 调用接口根据返回数据设置添加显示列表
         NetManager.ins.queryUserSpList((success, res) => {
             if(!success) {
                 return;
             }
-            console.log(res);
             const data = res.data;
+
+            /// TODO 0库存隐藏的临时低效方案，待优化
+            if(data.sp_1 <= 0 && data.sp_2 <= 0) {
+                this.cropGroup.visible = false;
+                this.noneImg.visible = true;
+            }else {
+                this.noneImg.visible = false;
+                if(data.sp_1 <= 0) {
+                    this[`${spData.sp_1.name}_group`].visible = false;
+                    this[`${spData.sp_2.name}_group`].x = this[`${spData.sp_1.name}_group`].x;
+                }
+                if(data.sp_2 <= 0) {
+                    this[`${spData.sp_2.name}_group`].visible = false;
+                }
+            }
+
             for(let k in spData) {
                 this[`${spData[k].name}_label`].text = `数量：${data[k]}`;
                 this[`${spData[k].name}_sell_btn`].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {

egret/src/Scenes/IndexScene/IndexUI.ts

@@ -45,8 +45,8 @@ export default class IndexUI extends ComponentBase {
             [this.warehouseBtn, this.onTap, this],
         ]).concat([ // OptionPanel
             [this.foodGroup, this.onTapOption, this],
-            [this['waterGroup'], this.onTapOption, this],
-            [this['speedGroup'], this.onTapOption, this],
+            [this.waterGroup, this.onTapOption, this],
+            [this.speedGroup, this.onTapOption, this],
         ])
     }
 
@@ -55,10 +55,10 @@ export default class IndexUI extends ComponentBase {
             case this.foodGroup:
                 showToast('点击饿了的动物才能进行喂食哦');
                 break;
-            case this['waterGroup']:
+            case this.waterGroup:
                 showToast('点击渴了的植物才能浇水哦');
                 break;
-            case this['speedGroup']:
+            case this.speedGroup:
                 break;
 
             default:
@@ -147,16 +147,16 @@ export default class IndexUI extends ComponentBase {
                 return;
             }
             const data = res.data;
-            this.userGold.text = `${data.unitName}：${data.credits}`;
-
+            this.userGold.text = `${data.unitName}：${data.consumerCredits}`;
+            this.userName.text = '欢趣使者';
         })
     }
 
     destroy() {
         super.destroy();
         IndexDispatcher.removeEvent('warehouseEffect', this.warehouseEffect, this);
-        IndexDispatcher.removeEvent('getPropInfo', this.getPropInfo, this)
-        IndexDispatcher.removeEvent('addGold', this.addGold, this);;
+        IndexDispatcher.removeEvent('getPropInfo', this.getPropInfo, this);
+        IndexDispatcher.removeEvent('addGold', this.addGold, this);
     }
 
     get skinKey() {

egret/src/Scenes/IndexScene/LandMgr.ts

@@ -5,10 +5,24 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 import { loadSvga } from "../../comm/loadSvga";
 import { getSvga } from "../../utils";
 
+/**
+ * 示意图
+ *    ////////////
+ *   /////1 1////    ////////////
+ *  /////1 1////    /////2 2////
+ * ////////////    /////2 2////
+ *                ////////////
+ *    ////////////
+ *   /////3 3////    ////////////
+ *  /////3 3////    /////4 4////
+ * ////////////    /////4 4////
+ *                ////////////
+ */
+
 const landPos = [   // 地块位置（注意顺序，影响层级）
-    {x: 180, y: 674},
+    {x: 170, y: 669},
     {x: 396, y: 778},
-    {x: 48, y: 856},
+    {x: 43, y: 851},
     {x: 288, y: 972},
 ];
 
@@ -64,7 +78,7 @@ export default class LandMgr {
         loadSvga(getSvga('流水动效')).then(
             (mv: egret.MovieClip) => {
                 mv.x = 550;
-                mv.y = 850;
+                mv.y = 865;
                 mv.touchEnabled = false;
                 IndexIns().gameLayer.addChildAt(mv, 3);
             }

egret/src/Scenes/IndexScene/Objs/Crop.ts

@@ -72,6 +72,7 @@ export default class Crop extends eui.Component {
     }
 
     private reset() {
+        this.progressBar && egret.Tween.removeTweens(this.progressBar);
         IndexIns().progressMgr.removeProgress(this.data.index);
         this.progressBar = null;
     }
@@ -143,6 +144,7 @@ export default class Crop extends eui.Component {
             case OPTION.PROGRESS:
                 this.touchEnabled = true;
                 this.addProgress(this.data.data.feedLeftSeconds);
+                egret.Tween.removeTweens(this.progressBar);
                 egret.Tween.get(this.progressBar).wait(2000).to({alpha: 0}, 200, egret.Ease.quartInOut);
                 break;
             case OPTION.NONE:
@@ -243,10 +245,12 @@ export default class Crop extends eui.Component {
                 }
                 break;
             case OPTION.PROGRESS:
-                egret.Tween.removeTweens(this.progressBar);
-                egret.Tween.get(this.progressBar).to({alpha: 1}, 200, egret.Ease.quartInOut).call(() => {
-                    egret.Tween.get(this.progressBar).wait(2000).to({alpha: 0}, 200, egret.Ease.quartInOut);
-                });
+                this.progressBar && (function() {
+                    egret.Tween.removeTweens(this.progressBar);
+                    egret.Tween.get(this.progressBar).to({alpha: 1}, 200, egret.Ease.quartInOut).call(() => {
+                        egret.Tween.get(this.progressBar).wait(2000).to({alpha: 0}, 200, egret.Ease.quartInOut);
+                    })
+                }.bind(this)());
                 break;
         }
     }
@@ -326,6 +330,7 @@ export default class Crop extends eui.Component {
     }
 
     private addProgress(nTime) {
+        // this.progressBar &&
         this.progressBar = IndexIns().progressMgr.addProgress({
             index: this.data.index,
             x: this.data.x + 88,

egret/src/ctrls/net/getRule.ts

@@ -13,7 +13,7 @@ export default
         if (DataManager.ins.getRuleData) {
             _callback(true);
         } else {
-            NetManager.ins.getRule(_callback);
+            NetManager.ins.getRuleNg(_callback);
         }
     })
 

mock/config.js

@@ -31,7 +31,7 @@ const config = {
         data: './json/getOptions.json'
     },
     '/ngapi/getRule': {
-        data: './json/getRule.json'
+        data: './json/getRuleNg.json'
     },
     '/activityVist/addTimesForActivity': {
         data: './json/addTimesForActivity.json'
@@ -269,18 +269,19 @@ const config = {
     '/hdtool/rank/rankInfo': {
         data: './json/rankInfo.json'
     },
+
     '/projectx/{projectId}/getUserSpList.query': {   // 任务信息
         data: './projectX/getUserSpList.json'
     },
     '/projectx/{projectId}/prize.query': {
         data: './projectX/queryPrizeInfo.json'
     },
-    '/ctool/getProjectUserInfo':{
-        data:'./projectX/getProjectUserInfo.json'
+    '/ctool/getProjectUserInfo': {
+        data: './projectX/getProjectUserInfo.json'
+    },
+    '/projectx/{projectId}/projectRule.query': { // 查询游戏规则
+        data: './projectX/getRule.json'
     },
-    // '/projectx/{projectId}/join_1/landInfo.do': {   // 土地信息
-    //     data: './joyousManor/getLandInfo.json'
-    // },
 
     // 欢趣庄园
     '/projectx/{projectId}/join_1/landInfo.do': {   // 土地信息
@@ -307,8 +308,8 @@ const config = {
     '/projectx/{projectId}/join_5/taskInfo.do': {   // 任务信息
         data: './joyousManor/taskInfo.json'
     },
-    '/projectx/{projectId}/join_4/priceInfo.do':{
-        data:'./joyousManor/priceInfo.json'
+    '/projectx/{projectId}/join_4/priceInfo.do': {
+        data: './joyousManor/priceInfo.json'
     },
 
 };
@@ -323,9 +324,8 @@ let strategyId = '';
 
 for (let item in config) {
     if (config.hasOwnProperty(item)) {
-        if (item.indexOf("{projectId}") !== -1 || item.indexOf("{strategyId}") !== -1) {
+        if (item.indexOf("{projectId}") !== -1) {
             let newKey = item.replace("{projectId}", projectId);
-            newKey = newKey.replace("{strategyId}", strategyId);
             config[newKey] = config[item];
             delete config[item];
             item = newKey;

mock/projectX/getRule.json

+{
+    "success": true,
+    "message": "OK",
+    "data": "规则规则规则"
+}
\ No newline at end of file

mock/projectX/getUserSpList.json

@@ -3,10 +3,10 @@
     "message": null,
     "code": null,
     "data": {
-        "sp_1": 1,
-        "sp_2": 100,
-        "sp_food_1": 1,
-        "sp_food_2": 1,
+        "sp_1": 0,
+        "sp_2": 0,
+        "sp_food_1": 100,
+        "sp_food_2": 100,
         "sp_task_1": 10,
         "sp_task_2": 100
     }