【修改】 修改战斗界面

assets/resources/edt_prefab/BoxContains/BoxItem.prefab

@@ -548,14 +548,14 @@
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 1
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        -154.668,
+        -144.054,
         0,
         0,
         0,
@@ -605,7 +605,7 @@
     "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
+    "_N$verticalAlign": 0,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,

assets/resources/res_image/person/person-tdt02.png.meta

@@ -26,8 +26,8 @@
       "height": 46,
       "rawWidth": 20,
       "rawHeight": 46,
-      "borderTop": 18,
-      "borderBottom": 19,
+      "borderTop": 9,
+      "borderBottom": 9,
       "borderLeft": 8,
       "borderRight": 8,
       "subMetas": {}

assets/script/app/config/ConfigBase.js

@@ -30,6 +30,10 @@ cc.Class({
         this.table = table
     },
 
+    getConfigAll() {
+        return this.table;
+    },
+
     // 从主键中拿某一行数据
     getByMainKey(idx) {
         // 从缓存中拿数据

assets/script/app/constants/AppConstants.js

@@ -51,6 +51,24 @@ window.JMC.PUBLIC_MSG = cc.Enum({
 
     BAG_INFO: "BAG_INFO",                   // 背包基本信息
     
+
+    // 战斗协议
+    ROOM_GET_INFO:"ROOM_GET_INFO",
+    ROOM_CREATE_ROOM:"ROOM_CREATE_ROOM",
+    ROOM_PLAYER_ENTER:"ROOM_PLAYER_ENTER",
+    ROOM_PLAYER_SEAT:"ROOM_PLAYER_SEAT",
+    ROOM_STAND_UP:"ROOM_STAND_UP",
+    ROOM_PLAYER_LEAVE:"ROOM_PLAYER_LEAVE",
+    ROOM_GET_RECORD_LIST:"ROOM_GET_RECORD_LIST",
+    ROOM_GET_PLAYER_RECORD_LIST:"ROOM_GET_PLAYER_RECORD_LIST",
+    ROOM_GET_BRILLIANT_RECORD_LIST:"ROOM_GET_BRILLIANT_RECORD_LIST",
+
+    ON_ROOM_NEW:"ON_ROOM_NEW",
+    ON_ROOM_DESTROY:"ON_ROOM_DESTROY",
+    ON_ROOM_PLAYER_CHANGE:"ON_ROOM_PLAYER_CHANGE",
+    ON_ROOM_SEAT_DOWN:"ON_ROOM_SEAT_DOWN",
+    ON_ROOM_BATTLE_SETTLE:"ON_ROOM_BATTLE_SETTLE",
+
 });
 
 // 通用消息类型优先级

assets/script/app/utils.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "58ee6ef6-77bf-4145-a97c-b9d0aab6b36e",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/script/app/utils/MultipleViewData.js

@@ -0,0 +1,44 @@
+
+cc.Class({
+    initRoot (rootNode) {
+        this.rootNode = rootNode;
+        this.views = [];
+        this.curViewType = null
+        return this;
+    },
+
+    addViewData(viewType) {
+        this.views.push({type:viewType, view:null, initing:false})
+    },
+
+    createOrShowView(type, parent) {
+        let viewData = this.views[type]
+        for (let vd of this.views) {
+            if (vd.view == null) {
+                continue
+            }
+            vd.view.active = false;
+        }
+
+        if (viewData.initing) {
+            return
+        }
+
+        if (viewData.view != null) {
+            viewData.view.active = true;
+            return
+        }
+
+        viewData.initing = true
+        let self = this
+        this.rootNode.createComponent(viewData.type, parent, null, function(node, status) {
+            if (status != 'ok') {
+                return
+            }
+
+            viewData.view = node
+            viewData.initing = false
+            node.active = self.curViewType == type
+        })
+    }
+})

assets/script/app/utils/MultipleViewData.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "615b09c7-9fd7-4171-9f0e-561da655d864",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/utils/SequenCreateView.js

@@ -0,0 +1,42 @@
+
+let MultipleViewData = require('MultipleViewData')
+
+cc.Class({
+    extends: MultipleViewData,
+
+    initRoot (rootNode) {
+        this._super(rootNode);
+        this.datas = [];
+        this.createIndex = 0;
+        return this;
+    },
+
+    addDatas(datas) {
+        this.datas = datas
+    },
+
+    startCreate(type, parent, cb) {
+        this.createIndex = 0
+        this.createView(type, parent, cb);
+    },
+
+    createView(type, parent, cb) {
+        if (this.createIndex >= this.datas.length) {
+            return;
+        }
+
+        let data = this.datas[this.createIndex]
+        let self = this
+        this.rootNode.createComponent(type, parent, data, function(node, status) {
+            if (status != 'ok') {
+                return
+            }
+
+            self.createIndex += 1;
+            self.createView(type, parent, cb);
+            if (cb) {
+                cb(node, data);
+            }
+        })
+    },
+})

assets/script/app/utils/SequenCreateView.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "6a66487d-c7ee-4d88-af3f-2f85612716be",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/view/battle/BattleMain.js

@@ -0,0 +1,115 @@
+const ButtonSelect1 = require('ButtonSelect1')
+const ViewBase = require('ViewBase');
+const SequenCreateView = require('SequenCreateView');
+const BoxItem = require('BoxItem')
+
+cc.Class({
+    extends: ViewBase,
+    properties: {
+        button1: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        button2: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        button3: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        buttonPrice1: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        buttonPrice2: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        buttonPrice3: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        buttonPrice4: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        scrollViewBox: {
+            default: null,
+            type: cc.ScrollView,
+            serializable: true,
+        },
+
+        viewContent: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        }
+    },
+
+    onLoad () {
+        this.buttons = [
+            this.button1,
+            this.button2,
+            this.button3,
+        ];
+
+        this.buttonPrices = [
+            this.buttonPrice1,
+            this.buttonPrice2,
+            this.buttonPrice3,
+            this.buttonPrice4,
+        ];
+
+        this.sequenCreateBoxs = new SequenCreateView().initRoot(this);
+        this.initBoxs();
+        this.onClickPrice(null, "0");
+    },
+
+    initBoxs() {
+        // getConfigAll
+        // this.sequenCreateBoxs.addDatas(G.CfgMgr.battleBoxConfig.getConfigAll());
+        this.sequenCreateBoxs.addDatas(G.CfgMgr.battleBoxConfig.getConfigAll());
+        this.sequenCreateBoxs.startCreate(JMC.UIEnum.BoxItem, this.scrollViewBox.content, function(node, data) {
+            let boxItem = node.getComponent(BoxItem);
+            boxItem.setScale(0.73);
+            boxItem.setNameScale(1/0.73);
+            boxItem.setName(data.name);
+            boxItem.setPrice(G.PlayUtils.getPrice(data.price));
+        });
+    },
+    
+
+    updatePriceSelect(index) {
+        for (let i = 0; i < this.buttonPrices.length; i++) {
+            const b = this.buttonPrices[i];
+            b.setSelect(index == i)
+        }
+    },
+
+    onClickTitle(event, customEventData) {
+        let index = parseInt(customEventData)
+    },
+
+    onClickPrice(event, customEventData) {
+        let index = parseInt(customEventData)
+        this.updatePriceSelect(index)
+    },
+
+
+    // update (dt) {},
+});

assets/script/app/view/battle/BattleMain.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "83fc1028-8005-4fee-85fa-c4c8395e1901",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/view/box_contains/BoxItem.js

@@ -27,13 +27,20 @@ cc.Class({
         },
     },
 
-    // LIFE-CYCLE CALLBACKS:
 
-    // onLoad () {},
+    setScale(s) {
+        this.node.scale = s;
+    },
 
-    start () {
+    setName(name) {
+        this.textName.string = name;
+    },
 
+    setNameScale(s) {
+        this.textName.node.scale = s;
     },
 
-    // update (dt) {},
+    setPrice(price) {
+        this.textPrice.string = price;
+    },
 });

assets/script/app/view/common/ViewBase.js

@@ -47,7 +47,6 @@ cc.Class({
             if (cb) {
                 cb(node, 'ok', undefined);
             }
-
         });
     },
 

assets/script/app/view/dream/DreamMain.js

@@ -1,5 +1,6 @@
-let ButtonSelect1 = require('ButtonSelect1')
-let ViewBase = require('ViewBase')
+const ButtonSelect1 = require('ButtonSelect1')
+const ViewBase = require('ViewBase');
+const MultipleViewData = require('MultipleViewData');
 
 cc.Class({
     extends: ViewBase,
@@ -43,12 +44,11 @@ cc.Class({
             this.button4,
         ];
 
-        this.views = [
-            {type:JMC.UIEnum.DreamPopular, view:null, initing:false},
-            {type:JMC.UIEnum.DreamBrilliant, view:null, initing:false},
-            {type:JMC.UIEnum.DreamDropRecord, view:null, initing:false},
-            {type:JMC.UIEnum.DreamStatistics, view:null, initing:false},
-        ];
+        this.multipleViewData = new MultipleViewData().initRoot(this)
+        this.multipleViewData.addViewData(JMC.UIEnum.DreamPopular);
+        this.multipleViewData.addViewData(JMC.UIEnum.DreamBrilliant);
+        this.multipleViewData.addViewData(JMC.UIEnum.DreamDropRecord);
+        this.multipleViewData.addViewData(JMC.UIEnum.DreamStatistics);
 
         this.curViewType = null
         this.onClickTitle(null, "0")
@@ -58,7 +58,8 @@ cc.Class({
         let index = parseInt(customEventData)
         this.updateButtonSelect(index);
         this.curViewType = index;
-        this.createOrShowView(this.curViewType)
+        this.multipleViewData.curViewType = index;
+        this.multipleViewData.createOrShowView(this.curViewType, this.viewContent)
     },
 
     updateButtonSelect(index) {
@@ -69,34 +70,7 @@ cc.Class({
     },
 
     createOrShowView(type) {
-        let viewData = this.views[type]
-        for (let vd of this.views) {
-            if (vd.view == null) {
-                continue
-            }
-            vd.view.active = false;
-        }
-
-        if (viewData.initing) {
-            return
-        }
-
-        if (viewData.view != null) {
-            viewData.view.active = true;
-            return
-        }
-
-        viewData.initing = true
-        let self = this
-        this.createComponent(viewData.type, this.viewContent, null, function(node, status) {
-            if (status != 'ok') {
-                return
-            }
 
-            viewData.view = node
-            viewData.initing = false
-            node.active = self.curViewType == type
-        })
     }
 
     // update (dt) {},

assets/script/core/CoreInit.js

@@ -17,6 +17,8 @@ module.exports = {
         ns.LogUtils       = require('LogUtils');
         // 函数工具
         ns.FuncUtils      = require('FuncUtils');
+        // 玩家相关工具
+        ns.PlayUtils      = require('PlayUtils');
         // 订单号工具
         ns.OrderUtils       = require('OrderUtils');
         // XMLHttp工具

assets/script/core/model/battle/BattleMgr.js

@@ -0,0 +1,190 @@
+/**
+ * 背包数据管理
+ */
+let BattleMgr = {
+    // # 房间玩家信息
+    // .DataRoomPlayer {
+    //     playerInfo 0: DataUserBaseInfo      # 玩家信息
+    //     seatId 1: integer                   # 位置ID
+    //     status 2: integer                   # 状态 0:进入 1:准备
+    // }
+
+    // # 房间信息
+    // .DataRoom {
+    //     roomId 0: integer                   # 房间号
+    //     playCount 1:integer                 # 战斗人数 - 历史战绩无此字段
+    //     battleBoxList 2: *integer           # 战斗箱子ID列表
+    //     playerList 3: *DataRoomPlayer       # 房间玩家列表 - 历史战绩仅保留战斗玩家
+    //     status 4: integer                   # 房间状态 0:等待中 1:进行中 2:结束
+    //     createTime 5: integer               # 创建时间
+    //     battleTime 6: integer               # 战斗开始时间
+    // }
+
+    // # 射击结果
+    // .DataBattleShot {
+    //     itemId 0: integer                   # 中奖饰品ID
+    //     price 1: integer                    # 射击价格
+    // }
+    // # 战斗玩家
+    // .DataBattlePlayer {
+    //     uid 0: integer                      # 玩家ID
+    //     seatId 1: integer                   # 座位ID
+    //     shotList 2: *DataBattleShot         # 射击结果列表
+    // }
+
+    // # 战斗 - 玩家掉落
+    // .DataBattlePlayerShot {
+    //     uid 0: integer                      # 玩家ID
+    //     shot 1: DataBattleShot              # 射击结果
+    // }
+    // # 战斗 - 轮次信息
+    // .DataBattleRound {
+    //     round 0: integer                    # 轮次
+    //     shotList 1: *DataBattlePlayerShot   # 玩家射击列表
+    // }
+    // # 战斗 - 结算
+    // .DataBattleSettle {
+    //     roomInfo 0: DataRoom                # 房间信息
+    //     battleId 1: string                  # 战斗编号
+    //     winUid 2: integer                   # 胜利玩家ID
+    //     rounds 3: *DataBattleRound          # 战斗轮次列表 - 历史战绩没有该字段
+    //     battlePlayerList 4: *DataBattlePlayer   # 战斗玩家列表
+    // }
+
+    _rooms: {}, // 房间列表
+    _myRoom:null,
+
+    init () {
+        if (CC_EDITOR) {
+            return;
+        }
+
+        // 推送消息
+        cc.game.on('on_room_new', this._onRoomNew, this);
+        cc.game.on('on_room_destroy', this._onRoomDestroy, this);
+        cc.game.on('on_room_player_change', this._onRoomPlayerChange, this);
+        cc.game.on('on_room_seat_down', this._onRoomSeatDown, this);
+        cc.game.on('on_room_battle_settle', this._onRoomBattleSettle, this);
+    },
+
+    //* ************* 客户端请求/响应 ************* *//
+    requestInfo () {
+        G.NetworkMgr.sendSocketRequest('room_get_info', {}, this._responseRoomGetInfo.bind(this));
+    },
+
+    requestRoomCreate(playCount, battleBoxList) {
+        let request = {
+            playCount: playCount,
+            battleBoxList: battleBoxList,
+        };
+        G.NetworkMgr.sendSocketRequest('room_create_room', request, this._responseRoomCreate.bind(this));
+    },
+
+    requestRoomPlayerEnter(roomId) {
+        let request = {
+            roomId: roomId,
+        };
+        G.NetworkMgr.sendSocketRequest('room_player_enter', request, this._responseRoomPlayerEnter.bind(this));
+    },
+
+    requestRoomPlayerSeat(roomId, seatId) {
+        let request = {
+            roomId: roomId,
+            seatId: seatId,
+        };
+        G.NetworkMgr.sendSocketRequest('room_player_seat', request, this._responseRoomPlayerSeat.bind(this));
+    },
+
+    requestRoomStandUp() {
+        G.NetworkMgr.sendSocketRequest('room_stand_up', {}, this._responseRoomStandUp.bind(this));
+    },
+
+    requestRoomPlayerLeave() {
+        G.NetworkMgr.sendSocketRequest('room_player_leave', {}, this._responseRoomPlayerLeave.bind(this));
+    },
+
+    requestRoomGetRecordList(lastTime) {
+        let request = {
+            lastTime: lastTime,
+        };
+        G.NetworkMgr.sendSocketRequest('room_get_record_list', request, this._responseRoomGetRecordList.bind(this));
+    },
+
+    requestRoomGetPlayerRecordList(lastTime) {
+        let request = {
+            lastTime: lastTime,
+        };
+        G.NetworkMgr.sendSocketRequest('room_get_player_record_list', request, this._responseRoomGetPlayerRecordList.bind(this));
+    },
+
+    requestRoomGetBrilliantRecordList() {
+        G.NetworkMgr.sendSocketRequest('room_get_brilliant_record_list', {}, this._responseRoomGetBrilliantRecordList.bind(this));
+    },
+
+    _responseRoomGetInfo (data) {
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            // 房间列表
+            this._rooms = responseInfo.roomList;
+            this._myRoom = responseInfo.myRoom;
+            G.PublicMgr.emit(JMC.PUBLIC_MSG.BAG_INFO);
+        } else {
+            // 断开网络并且弹出重连窗口
+            G.NetworkMgr.closeSocket();
+            G.AppUtils.getSceneCtrl().showOfflineAlert();
+        }
+    },
+
+    _responseRoomCreate (data){
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            // 房间列表
+            this._myRoom = responseInfo.room;
+            G.PublicMgr.emit(JMC.PUBLIC_MSG.ROOM_CREATE_ROOM);
+        } else {
+            // 断开网络并且弹出重连窗口
+            G.NetworkMgr.closeSocket();
+            G.AppUtils.getSceneCtrl().showOfflineAlert();
+        }
+    },
+
+    _responseRoomPlayerEnter (data) {
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            // 房间列表
+            this._myRoom = responseInfo.room;
+            G.PublicMgr.emit(JMC.PUBLIC_MSG.ROOM_CREATE_ROOM);
+        } else {
+            // 断开网络并且弹出重连窗口
+            G.NetworkMgr.closeSocket();
+            G.AppUtils.getSceneCtrl().showOfflineAlert();
+        }
+    },
+
+    _responseRoomPlayerSeat (data) {
+
+    },
+
+    _responseRoomStandUp (data) {
+
+    },
+
+    _responseRoomPlayerLeave (data) {
+
+    },
+
+    _responseRoomGetRecordList (data) {
+
+    },
+
+    _responseRoomGetPlayerRecordList (data) {
+
+    },
+
+    _responseRoomGetBrilliantRecordList (data) {
+
+    },
+}
+
+
+module.exports = BattleMgr;

assets/script/core/utils/PlayUtils.js

@@ -0,0 +1,5 @@
+module.exports = {
+    getPrice(configPrice) {
+        return String(1.0 * configPrice / 100)
+    },
+};

assets/script/core/utils/PlayUtils.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "020cacf3-7f25-4c87-90cd-7fa1a853804a",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}