diff --git a/client/version/chess/assets/module/game/majiang/scene/majiang.fire b/client/version/chess/assets/module/game/majiang/scene/majiang.fire index 64df05a..a04a2c1 100644 --- a/client/version/chess/assets/module/game/majiang/scene/majiang.fire +++ b/client/version/chess/assets/module/game/majiang/scene/majiang.fire @@ -62,7 +62,7 @@ "__id__": 97 }, { - "__id__": 154 + "__id__": 156 }, { "__id__": 41 @@ -72,10 +72,10 @@ "_active": true, "_components": [ { - "__id__": 238 + "__id__": 240 }, { - "__id__": 239 + "__id__": 241 } ], "_prefab": null, @@ -3975,7 +3975,7 @@ "__id__": 98 }, { - "__id__": 137 + "__id__": 139 } ], "_tag": -1, @@ -4030,13 +4030,13 @@ "__id__": 99 }, { - "__id__": 109 + "__id__": 111 }, { - "__id__": 119 + "__id__": 121 }, { - "__id__": 128 + "__id__": 130 } ], "_tag": -1, @@ -4095,6 +4095,9 @@ }, { "__id__": 106 + }, + { + "__id__": 109 } ], "_tag": -1, @@ -4463,6 +4466,89 @@ "_N$verticalDirection": 0, "_N$horizontalDirection": 1 }, + { + "__type__": "cc.Node", + "_name": "hu", + "_objFlags": 0, + "_parent": { + "__id__": 99 + }, + "_children": [], + "_tag": -1, + "_active": true, + "_components": [ + { + "__id__": 110 + } + ], + "_prefab": null, + "_id": "274Mb05/ZF37dCj2m1+BoP", + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_cascadeOpacityEnabled": true, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 72 + }, + "_rotationX": 0, + "_rotationY": 0, + "_scaleX": 1, + "_scaleY": 1, + "_position": { + "__type__": "cc.Vec2", + "x": 390, + "y": 126 + }, + "_skewX": 0, + "_skewY": 0, + "_localZOrder": 0, + "_globalZOrder": 0, + "_opacityModifyRGB": false, + "groupIndex": 0 + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 109 + }, + "_enabled": true, + "_layoutSize": { + "__type__": "cc.Size", + "width": 100, + "height": 72 + }, + "_resize": 2, + "_N$layoutType": 3, + "_N$padding": 0, + "_N$cellSize": { + "__type__": "cc.Size", + "width": 23, + "height": 36 + }, + "_N$startAxis": 1, + "_N$paddingLeft": 0, + "_N$paddingRight": 0, + "_N$paddingTop": 0, + "_N$paddingBottom": 0, + "_N$spacingX": 0, + "_N$spacingY": 0, + "_N$verticalDirection": 1, + "_N$horizontalDirection": 1 + }, { "__type__": "cc.Node", "_name": "leftdesk", @@ -4472,10 +4558,10 @@ }, "_children": [ { - "__id__": 110 + "__id__": 112 }, { - "__id__": 114 + "__id__": 116 } ], "_tag": -1, @@ -4523,20 +4609,20 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 109 + "__id__": 111 }, "_children": [], "_tag": -1, "_active": true, "_components": [ - { - "__id__": 111 - }, - { - "__id__": 112 - }, { "__id__": 113 + }, + { + "__id__": 114 + }, + { + "__id__": 115 } ], "_prefab": null, @@ -4581,7 +4667,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "_spriteFrame": { @@ -4607,7 +4693,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "_layoutSize": { @@ -4638,7 +4724,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "_defaultClip": null, @@ -4654,24 +4740,24 @@ "_name": "kong", "_objFlags": 0, "_parent": { - "__id__": 109 + "__id__": 111 }, "_children": [ { - "__id__": 115 + "__id__": 117 }, { - "__id__": 116 + "__id__": 118 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 117 + "__id__": 119 }, { - "__id__": 118 + "__id__": 120 } ], "_prefab": null, @@ -4716,7 +4802,7 @@ "_name": "ckong", "_objFlags": 0, "_parent": { - "__id__": 114 + "__id__": 116 }, "_children": [], "_tag": -1, @@ -4764,7 +4850,7 @@ "_name": "ekong", "_objFlags": 0, "_parent": { - "__id__": 114 + "__id__": 116 }, "_children": [], "_tag": -1, @@ -4812,7 +4898,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 114 + "__id__": 116 }, "_enabled": true, "_spriteFrame": { @@ -4838,7 +4924,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 114 + "__id__": 116 }, "_enabled": true, "_layoutSize": { @@ -4873,10 +4959,10 @@ }, "_children": [ { - "__id__": 120 + "__id__": 122 }, { - "__id__": 125 + "__id__": 127 } ], "_tag": -1, @@ -4924,24 +5010,24 @@ "_name": "kong", "_objFlags": 0, "_parent": { - "__id__": 119 + "__id__": 121 }, "_children": [ { - "__id__": 121 + "__id__": 123 }, { - "__id__": 122 + "__id__": 124 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 123 + "__id__": 125 }, { - "__id__": 124 + "__id__": 126 } ], "_prefab": null, @@ -4986,7 +5072,7 @@ "_name": "ckong", "_objFlags": 0, "_parent": { - "__id__": 120 + "__id__": 122 }, "_children": [], "_tag": -1, @@ -5034,7 +5120,7 @@ "_name": "ekong", "_objFlags": 0, "_parent": { - "__id__": 120 + "__id__": 122 }, "_children": [], "_tag": -1, @@ -5082,7 +5168,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 120 + "__id__": 122 }, "_enabled": true, "_spriteFrame": { @@ -5108,7 +5194,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 120 + "__id__": 122 }, "_enabled": true, "_layoutSize": { @@ -5139,17 +5225,17 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 119 + "__id__": 121 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 126 + "__id__": 128 }, { - "__id__": 127 + "__id__": 129 } ], "_prefab": null, @@ -5180,7 +5266,7 @@ "_position": { "__type__": "cc.Vec2", "x": 0, - "y": 3 + "y": 32 }, "_skewX": 0, "_skewY": 0, @@ -5194,7 +5280,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 125 + "__id__": 127 }, "_enabled": true, "_spriteFrame": { @@ -5220,7 +5306,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 125 + "__id__": 127 }, "_enabled": true, "_layoutSize": { @@ -5255,10 +5341,10 @@ }, "_children": [ { - "__id__": 129 + "__id__": 131 }, { - "__id__": 132 + "__id__": 134 } ], "_tag": -1, @@ -5306,17 +5392,17 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 128 + "__id__": 130 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 130 + "__id__": 132 }, { - "__id__": 131 + "__id__": 133 } ], "_prefab": null, @@ -5361,7 +5447,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 129 + "__id__": 131 }, "_enabled": true, "_spriteFrame": { @@ -5387,7 +5473,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 129 + "__id__": 131 }, "_enabled": true, "_layoutSize": { @@ -5418,24 +5504,24 @@ "_name": "kong", "_objFlags": 0, "_parent": { - "__id__": 128 + "__id__": 130 }, "_children": [ { - "__id__": 133 + "__id__": 135 }, { - "__id__": 134 + "__id__": 136 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 135 + "__id__": 137 }, { - "__id__": 136 + "__id__": 138 } ], "_prefab": null, @@ -5480,7 +5566,7 @@ "_name": "ekong", "_objFlags": 0, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [], "_tag": -1, @@ -5528,7 +5614,7 @@ "_name": "ckong", "_objFlags": 0, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [], "_tag": -1, @@ -5576,7 +5662,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "_spriteFrame": { @@ -5602,7 +5688,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "_layoutSize": { @@ -5637,16 +5723,16 @@ }, "_children": [ { - "__id__": 138 + "__id__": 140 }, { - "__id__": 142 + "__id__": 144 }, { - "__id__": 146 + "__id__": 148 }, { - "__id__": 150 + "__id__": 152 } ], "_tag": -1, @@ -5694,11 +5780,11 @@ "_name": "deskcard", "_objFlags": 0, "_parent": { - "__id__": 137 + "__id__": 139 }, "_children": [ { - "__id__": 139 + "__id__": 141 } ], "_tag": -1, @@ -5746,17 +5832,17 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 138 + "__id__": 140 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 140 + "__id__": 142 }, { - "__id__": 141 + "__id__": 143 } ], "_prefab": null, @@ -5801,7 +5887,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 141 }, "_enabled": true, "_spriteFrame": { @@ -5827,7 +5913,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 141 }, "_enabled": true, "_layoutSize": { @@ -5858,11 +5944,11 @@ "_name": "leftdesk", "_objFlags": 0, "_parent": { - "__id__": 137 + "__id__": 139 }, "_children": [ { - "__id__": 143 + "__id__": 145 } ], "_tag": -1, @@ -5910,17 +5996,17 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 144 + "__id__": 146 }, { - "__id__": 145 + "__id__": 147 } ], "_prefab": null, @@ -5965,7 +6051,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "_spriteFrame": { @@ -5991,7 +6077,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "_layoutSize": { @@ -6022,11 +6108,11 @@ "_name": "rightdesk", "_objFlags": 0, "_parent": { - "__id__": 137 + "__id__": 139 }, "_children": [ { - "__id__": 147 + "__id__": 149 } ], "_tag": -1, @@ -6074,17 +6160,17 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 146 + "__id__": 148 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 148 + "__id__": 150 }, { - "__id__": 149 + "__id__": 151 } ], "_prefab": null, @@ -6129,7 +6215,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 147 + "__id__": 149 }, "_enabled": true, "_spriteFrame": { @@ -6155,7 +6241,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 147 + "__id__": 149 }, "_enabled": true, "_layoutSize": { @@ -6186,11 +6272,11 @@ "_name": "topdesk", "_objFlags": 0, "_parent": { - "__id__": 137 + "__id__": 139 }, "_children": [ { - "__id__": 151 + "__id__": 153 } ], "_tag": -1, @@ -6238,17 +6324,17 @@ "_name": "layout", "_objFlags": 0, "_parent": { - "__id__": 150 + "__id__": 152 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 152 + "__id__": 154 }, { - "__id__": 153 + "__id__": 155 } ], "_prefab": null, @@ -6293,7 +6379,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "_spriteFrame": { @@ -6319,7 +6405,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "_layoutSize": { @@ -6354,20 +6440,20 @@ }, "_children": [ { - "__id__": 155 + "__id__": 157 }, { - "__id__": 186 + "__id__": 188 }, { - "__id__": 217 + "__id__": 219 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 237 + "__id__": 239 } ], "_prefab": null, @@ -6412,24 +6498,24 @@ "_name": "two", "_objFlags": 0, "_parent": { - "__id__": 154 + "__id__": 156 }, "_children": [ { - "__id__": 156 + "__id__": 158 }, { - "__id__": 162 + "__id__": 164 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 184 + "__id__": 186 }, { - "__id__": 185 + "__id__": 187 } ], "_prefab": null, @@ -6474,18 +6560,18 @@ "_name": "吃碰杠-提示框", "_objFlags": 0, "_parent": { - "__id__": 155 + "__id__": 157 }, "_children": [ { - "__id__": 157 + "__id__": 159 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 161 + "__id__": 163 } ], "_prefab": null, @@ -6530,18 +6616,18 @@ "_name": "吃碰杠-提示牌", "_objFlags": 0, "_parent": { - "__id__": 156 + "__id__": 158 }, "_children": [ { - "__id__": 158 + "__id__": 160 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 160 + "__id__": 162 } ], "_prefab": null, @@ -6586,14 +6672,14 @@ "_name": "麻将牌-牌面-wan1", "_objFlags": 0, "_parent": { - "__id__": 157 + "__id__": 159 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 159 + "__id__": 161 } ], "_prefab": null, @@ -6638,7 +6724,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 158 + "__id__": 160 }, "_enabled": true, "_spriteFrame": { @@ -6666,7 +6752,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 157 + "__id__": 159 }, "_enabled": true, "_spriteFrame": { @@ -6694,7 +6780,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 156 + "__id__": 158 }, "_enabled": true, "_spriteFrame": { @@ -6722,30 +6808,30 @@ "_name": "action", "_objFlags": 0, "_parent": { - "__id__": 155 + "__id__": 157 }, "_children": [ { - "__id__": 163 + "__id__": 165 }, { - "__id__": 167 + "__id__": 169 }, { - "__id__": 171 + "__id__": 173 }, { - "__id__": 175 + "__id__": 177 }, { - "__id__": 179 + "__id__": 181 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 183 + "__id__": 185 } ], "_prefab": null, @@ -6790,17 +6876,17 @@ "_name": "gang", "_objFlags": 0, "_parent": { - "__id__": 162 + "__id__": 164 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 164 + "__id__": 166 }, { - "__id__": 165 + "__id__": 167 } ], "_prefab": null, @@ -6845,7 +6931,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 163 + "__id__": 165 }, "_enabled": true, "_spriteFrame": { @@ -6873,7 +6959,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 163 + "__id__": 165 }, "_enabled": true, "transition": 3, @@ -6897,7 +6983,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 166 + "__id__": 168 } ], "_N$interactable": true, @@ -6919,7 +7005,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 163 + "__id__": 165 } }, { @@ -6936,17 +7022,17 @@ "_name": "peng", "_objFlags": 0, "_parent": { - "__id__": 162 + "__id__": 164 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 168 + "__id__": 170 }, { - "__id__": 169 + "__id__": 171 } ], "_prefab": null, @@ -6991,7 +7077,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 167 + "__id__": 169 }, "_enabled": true, "_spriteFrame": { @@ -7019,7 +7105,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 167 + "__id__": 169 }, "_enabled": true, "transition": 3, @@ -7043,7 +7129,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 170 + "__id__": 172 } ], "_N$interactable": true, @@ -7065,7 +7151,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 167 + "__id__": 169 } }, { @@ -7082,17 +7168,17 @@ "_name": "chi", "_objFlags": 0, "_parent": { - "__id__": 162 + "__id__": 164 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 172 + "__id__": 174 }, { - "__id__": 173 + "__id__": 175 } ], "_prefab": null, @@ -7137,7 +7223,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 171 + "__id__": 173 }, "_enabled": true, "_spriteFrame": { @@ -7165,7 +7251,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 171 + "__id__": 173 }, "_enabled": true, "transition": 3, @@ -7189,7 +7275,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 174 + "__id__": 176 } ], "_N$interactable": true, @@ -7211,7 +7297,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 171 + "__id__": 173 } }, { @@ -7228,17 +7314,17 @@ "_name": "hu", "_objFlags": 0, "_parent": { - "__id__": 162 + "__id__": 164 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 176 + "__id__": 178 }, { - "__id__": 177 + "__id__": 179 } ], "_prefab": null, @@ -7283,7 +7369,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "_spriteFrame": { @@ -7311,7 +7397,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "transition": 3, @@ -7335,7 +7421,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 178 + "__id__": 180 } ], "_N$interactable": true, @@ -7357,7 +7443,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 175 + "__id__": 177 } }, { @@ -7374,17 +7460,17 @@ "_name": "guo", "_objFlags": 0, "_parent": { - "__id__": 162 + "__id__": 164 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 180 + "__id__": 182 }, { - "__id__": 181 + "__id__": 183 } ], "_prefab": null, @@ -7429,7 +7515,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 179 + "__id__": 181 }, "_enabled": true, "_spriteFrame": { @@ -7457,7 +7543,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 179 + "__id__": 181 }, "_enabled": true, "transition": 3, @@ -7481,7 +7567,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 182 + "__id__": 184 } ], "_N$interactable": true, @@ -7503,7 +7589,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 179 + "__id__": 181 } }, { @@ -7520,7 +7606,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 162 + "__id__": 164 }, "_enabled": true, "_layoutSize": { @@ -7551,7 +7637,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 155 + "__id__": 157 }, "_enabled": true, "_defaultClip": { @@ -7572,7 +7658,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 155 + "__id__": 157 }, "_enabled": true, "atlas": { @@ -7582,10 +7668,10 @@ "__uuid__": "9917343c-0dbb-427b-929c-0e01f0eb67fa" }, "cardvalue": { - "__id__": 158 + "__id__": 160 }, "target": { - "__id__": 155 + "__id__": 157 } }, { @@ -7593,24 +7679,24 @@ "_name": "three", "_objFlags": 0, "_parent": { - "__id__": 154 + "__id__": 156 }, "_children": [ { - "__id__": 187 + "__id__": 189 }, { - "__id__": 193 + "__id__": 195 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 215 + "__id__": 217 }, { - "__id__": 216 + "__id__": 218 } ], "_prefab": null, @@ -7655,18 +7741,18 @@ "_name": "吃碰杠-提示框", "_objFlags": 0, "_parent": { - "__id__": 186 + "__id__": 188 }, "_children": [ { - "__id__": 188 + "__id__": 190 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 192 + "__id__": 194 } ], "_prefab": null, @@ -7711,18 +7797,18 @@ "_name": "吃碰杠-提示牌", "_objFlags": 0, "_parent": { - "__id__": 187 + "__id__": 189 }, "_children": [ { - "__id__": 189 + "__id__": 191 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 191 + "__id__": 193 } ], "_prefab": null, @@ -7767,14 +7853,14 @@ "_name": "麻将牌-牌面-wan1", "_objFlags": 0, "_parent": { - "__id__": 188 + "__id__": 190 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 190 + "__id__": 192 } ], "_prefab": null, @@ -7819,7 +7905,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 189 + "__id__": 191 }, "_enabled": true, "_spriteFrame": { @@ -7847,7 +7933,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "_spriteFrame": { @@ -7875,7 +7961,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "_spriteFrame": { @@ -7903,30 +7989,30 @@ "_name": "action", "_objFlags": 0, "_parent": { - "__id__": 186 + "__id__": 188 }, "_children": [ { - "__id__": 194 + "__id__": 196 }, { - "__id__": 198 + "__id__": 200 }, { - "__id__": 202 + "__id__": 204 }, { - "__id__": 206 + "__id__": 208 }, { - "__id__": 210 + "__id__": 212 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 214 + "__id__": 216 } ], "_prefab": null, @@ -7971,17 +8057,17 @@ "_name": "gang", "_objFlags": 0, "_parent": { - "__id__": 193 + "__id__": 195 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 195 + "__id__": 197 }, { - "__id__": 196 + "__id__": 198 } ], "_prefab": null, @@ -8026,7 +8112,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 194 + "__id__": 196 }, "_enabled": true, "_spriteFrame": { @@ -8054,7 +8140,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 194 + "__id__": 196 }, "_enabled": true, "transition": 3, @@ -8078,7 +8164,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 197 + "__id__": 199 } ], "_N$interactable": true, @@ -8100,7 +8186,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 194 + "__id__": 196 } }, { @@ -8117,17 +8203,17 @@ "_name": "peng", "_objFlags": 0, "_parent": { - "__id__": 193 + "__id__": 195 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 199 + "__id__": 201 }, { - "__id__": 200 + "__id__": 202 } ], "_prefab": null, @@ -8172,7 +8258,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 198 + "__id__": 200 }, "_enabled": true, "_spriteFrame": { @@ -8200,7 +8286,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 198 + "__id__": 200 }, "_enabled": true, "transition": 3, @@ -8224,7 +8310,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 201 + "__id__": 203 } ], "_N$interactable": true, @@ -8246,7 +8332,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 198 + "__id__": 200 } }, { @@ -8263,17 +8349,17 @@ "_name": "chi", "_objFlags": 0, "_parent": { - "__id__": 193 + "__id__": 195 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 203 + "__id__": 205 }, { - "__id__": 204 + "__id__": 206 } ], "_prefab": null, @@ -8318,7 +8404,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 202 + "__id__": 204 }, "_enabled": true, "_spriteFrame": { @@ -8346,7 +8432,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 202 + "__id__": 204 }, "_enabled": true, "transition": 3, @@ -8370,7 +8456,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 205 + "__id__": 207 } ], "_N$interactable": true, @@ -8392,7 +8478,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 202 + "__id__": 204 } }, { @@ -8409,17 +8495,17 @@ "_name": "hu", "_objFlags": 0, "_parent": { - "__id__": 193 + "__id__": 195 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 207 + "__id__": 209 }, { - "__id__": 208 + "__id__": 210 } ], "_prefab": null, @@ -8464,7 +8550,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 206 + "__id__": 208 }, "_enabled": true, "_spriteFrame": { @@ -8492,7 +8578,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 206 + "__id__": 208 }, "_enabled": true, "transition": 3, @@ -8516,7 +8602,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 209 + "__id__": 211 } ], "_N$interactable": true, @@ -8538,7 +8624,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 206 + "__id__": 208 } }, { @@ -8555,17 +8641,17 @@ "_name": "guo", "_objFlags": 0, "_parent": { - "__id__": 193 + "__id__": 195 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 211 + "__id__": 213 }, { - "__id__": 212 + "__id__": 214 } ], "_prefab": null, @@ -8610,7 +8696,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 210 + "__id__": 212 }, "_enabled": true, "_spriteFrame": { @@ -8638,7 +8724,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 210 + "__id__": 212 }, "_enabled": true, "transition": 3, @@ -8662,7 +8748,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 213 + "__id__": 215 } ], "_N$interactable": true, @@ -8684,7 +8770,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 210 + "__id__": 212 } }, { @@ -8701,7 +8787,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 193 + "__id__": 195 }, "_enabled": true, "_layoutSize": { @@ -8732,7 +8818,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 186 + "__id__": 188 }, "_enabled": true, "_defaultClip": { @@ -8753,7 +8839,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 186 + "__id__": 188 }, "_enabled": true, "atlas": { @@ -8763,10 +8849,10 @@ "__uuid__": "9917343c-0dbb-427b-929c-0e01f0eb67fa" }, "cardvalue": { - "__id__": 189 + "__id__": 191 }, "target": { - "__id__": 186 + "__id__": 188 } }, { @@ -8774,24 +8860,24 @@ "_name": "deal", "_objFlags": 0, "_parent": { - "__id__": 154 + "__id__": 156 }, "_children": [ { - "__id__": 218 + "__id__": 220 }, { - "__id__": 224 + "__id__": 226 }, { - "__id__": 230 + "__id__": 232 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 236 + "__id__": 238 } ], "_prefab": null, @@ -8836,21 +8922,21 @@ "_name": "gang", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 219 }, "_children": [ { - "__id__": 219 + "__id__": 221 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 221 + "__id__": 223 }, { - "__id__": 222 + "__id__": 224 } ], "_prefab": null, @@ -8895,14 +8981,14 @@ "_name": "gang", "_objFlags": 0, "_parent": { - "__id__": 218 + "__id__": 220 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 220 + "__id__": 222 } ], "_prefab": null, @@ -8947,7 +9033,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 219 + "__id__": 221 }, "_enabled": true, "_spriteFrame": { @@ -8975,7 +9061,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 218 + "__id__": 220 }, "_enabled": true, "_spriteFrame": { @@ -9003,7 +9089,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 218 + "__id__": 220 }, "_enabled": true, "transition": 3, @@ -9027,7 +9113,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 223 + "__id__": 225 } ], "_N$interactable": true, @@ -9049,7 +9135,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 219 + "__id__": 221 } }, { @@ -9066,21 +9152,21 @@ "_name": "chi", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 219 }, "_children": [ { - "__id__": 225 + "__id__": 227 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 227 + "__id__": 229 }, { - "__id__": 228 + "__id__": 230 } ], "_prefab": null, @@ -9125,14 +9211,14 @@ "_name": "chi", "_objFlags": 0, "_parent": { - "__id__": 224 + "__id__": 226 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 226 + "__id__": 228 } ], "_prefab": null, @@ -9177,7 +9263,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 225 + "__id__": 227 }, "_enabled": true, "_spriteFrame": { @@ -9205,7 +9291,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 224 + "__id__": 226 }, "_enabled": true, "_spriteFrame": { @@ -9233,7 +9319,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 224 + "__id__": 226 }, "_enabled": true, "transition": 3, @@ -9257,7 +9343,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 229 + "__id__": 231 } ], "_N$interactable": true, @@ -9279,7 +9365,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 225 + "__id__": 227 } }, { @@ -9296,21 +9382,21 @@ "_name": "hu", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 219 }, "_children": [ { - "__id__": 231 + "__id__": 233 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 233 + "__id__": 235 }, { - "__id__": 234 + "__id__": 236 } ], "_prefab": null, @@ -9355,14 +9441,14 @@ "_name": "hu", "_objFlags": 0, "_parent": { - "__id__": 230 + "__id__": 232 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 232 + "__id__": 234 } ], "_prefab": null, @@ -9407,7 +9493,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 231 + "__id__": 233 }, "_enabled": true, "_spriteFrame": { @@ -9435,7 +9521,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 230 + "__id__": 232 }, "_enabled": true, "_spriteFrame": { @@ -9463,7 +9549,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 230 + "__id__": 232 }, "_enabled": true, "transition": 3, @@ -9487,7 +9573,7 @@ "hoverSprite": null, "clickEvents": [ { - "__id__": 235 + "__id__": 237 } ], "_N$interactable": true, @@ -9509,7 +9595,7 @@ "_N$normalSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 231 + "__id__": 233 } }, { @@ -9526,7 +9612,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 217 + "__id__": 219 }, "_enabled": true, "_layoutSize": { @@ -9557,7 +9643,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 154 + "__id__": 156 }, "_enabled": true, "_defaultClip": null, @@ -9617,13 +9703,13 @@ "__id__": 104 }, "left_panel": { - "__id__": 110 + "__id__": 112 }, "right_panel": { - "__id__": 125 + "__id__": 127 }, "top_panel": { - "__id__": 129 + "__id__": 131 }, "cards_left": { "__uuid__": "b3924d75-cae2-4f4b-86bd-fc55fb879d43" @@ -9644,34 +9730,34 @@ "__uuid__": "e2928c04-6691-40a0-a871-ce332c253c17" }, "deskcards_current_panel": { - "__id__": 139 + "__id__": 141 }, "deskcards_right_panel": { - "__id__": 147 + "__id__": 149 }, "deskcards_top_panel": { - "__id__": 151 + "__id__": 153 }, "deskcards_left_panel": { - "__id__": 143 + "__id__": 145 }, "searchlight": { "__id__": 54 }, "actionnode_two": { - "__id__": 155 + "__id__": 157 }, "actionnode_two_list": { - "__id__": 162 + "__id__": 164 }, "actionnode_three": { - "__id__": 186 + "__id__": 188 }, "actionnode_three_list": { - "__id__": 193 + "__id__": 195 }, "actionnode_deal": { - "__id__": 217 + "__id__": 219 }, "action_gang_ming_prefab": { "__uuid__": "7902ab86-8992-403b-ba32-233c2fb2a4a4" @@ -9696,6 +9782,12 @@ }, "inviteplayer": { "__uuid__": "0dd046d9-463b-4149-8aea-d12fb4b9b821" - } + }, + "hu_cards_current": { + "__id__": 109 + }, + "hu_cards_top": null, + "hu_cards_left": null, + "hu_cards_right": null } ] \ No newline at end of file diff --git a/client/version/chess/assets/module/game/majiang/script/MajiangDataBind.js b/client/version/chess/assets/module/game/majiang/script/MajiangDataBind.js index fcbc560..6e0e591 100644 --- a/client/version/chess/assets/module/game/majiang/script/MajiangDataBind.js +++ b/client/version/chess/assets/module/game/majiang/script/MajiangDataBind.js @@ -153,6 +153,22 @@ cc.Class({ inviteplayer:{ default:null , type : cc.Prefab + }, + hu_cards_current:{ + default:null , + type : cc.Node + }, + hu_cards_top:{ + default:null , + type : cc.Node + }, + hu_cards_left:{ + default:null , + type : cc.Node + }, + hu_cards_right:{ + default:null , + type : cc.Node } }, @@ -860,7 +876,6 @@ cc.Class({ /** * 杠后移除当前手牌,进入到 杠 列表里 */ - for(var inx = 0 ; inx < context.playercards.length ; ){ let temp = context.playercards[inx].getComponent("HandCards"); if(data.cardtype == temp.mjtype && data.cardvalue == temp.mjvalue){ @@ -870,48 +885,58 @@ cc.Class({ inx++ ; } } + if(data.action == "hu") { + //胡牌了,把胡的牌放入到胡牌列表里,然后 , 把当前的玩家的牌局置为不可点击 + let hu_card = cc.instantiate(context.takecards_one); + let temp = hu_card.getComponent("DeskCards"); + temp.init(data.card); - let cards_gang ; + context.deskcards.push(hu_card); + hu_card.setScale (0.8 , 0.8) ; + hu_card.parent = context.hu_cards_current; + }else{ + let cards_gang; - /** - * 刚和碰共用一个 Prefab,都是来自于 cards_gang_ming_prefab ,显示方式也相同, 区别在于:刚显示四张牌,碰显示两张牌 - */ - if(data.actype == "an"){ - cards_gang = cc.instantiate(context.cards_gang_an_prefab); - }else{ - cards_gang = cc.instantiate(context.cards_gang_ming_prefab); - } - let temp_script = cards_gang.getComponent("GangAction"); - if(data.action == "gang"){ - temp_script.init(data.card , true); - }else{ - temp_script.init(data.card , false); - } - if(data.action == "peng" || data.action == "chi"){ /** - * - * 碰了以后的 + * 刚和碰共用一个 Prefab,都是来自于 cards_gang_ming_prefab ,显示方式也相同, 区别在于:刚显示四张牌,碰显示两张牌 */ - let temp = context.cards_panel.children[context.cards_panel.children.length - 1] ; - if(temp!=null){ - let script = temp.getComponent("HandCards") ; - if(script != null){ - script.lastone() ; + if (data.actype == "an") { + cards_gang = cc.instantiate(context.cards_gang_an_prefab); + } else { + cards_gang = cc.instantiate(context.cards_gang_ming_prefab); + } + let temp_script = cards_gang.getComponent("GangAction"); + if (data.action == "gang") { + temp_script.init(data.card, true); + } else { + temp_script.init(data.card, false); + } + if (data.action == "peng" || data.action == "chi") { + /** + * + * 碰了以后的 + */ + let temp = context.cards_panel.children[context.cards_panel.children.length - 1]; + if (temp != null) { + let script = temp.getComponent("HandCards"); + if (script != null) { + script.lastone(); + } } } - } - cards_gang.parent = context.gang_current ; - context.actioncards.push(cards_gang) ; + cards_gang.parent = context.gang_current; + context.actioncards.push(cards_gang); - for(var inx = 0 ; inx < context.deskcards.length ; inx++){ - var temp = context.deskcards[inx] ; - if(temp!=null){ - var script = temp.getComponent("DeskCards"); - if(script!=null && script.value == data.card){ - temp.destroy() ; - context.deskcards.splice(inx,inx+1) ; - break ; + for (var inx = 0; inx < context.deskcards.length; inx++) { + var temp = context.deskcards[inx]; + if (temp != null) { + var script = temp.getComponent("DeskCards"); + if (script != null && script.value == data.card) { + temp.destroy(); + context.deskcards.splice(inx, inx + 1); + break; + } } } } diff --git a/client/version/chess/assets/resources/script/lib/HTTP.js b/client/version/chess/assets/resources/script/lib/HTTP.js index f141c8f..79ccf7a 100644 --- a/client/version/chess/assets/resources/script/lib/HTTP.js +++ b/client/version/chess/assets/resources/script/lib/HTTP.js @@ -15,8 +15,8 @@ var HTTP = cc.Class({ // ... }, statics: { - baseURL:"http://192.168.1.155", - wsURL : "http://192.168.1.155:9081", + baseURL:"http://127.0.0.1", + wsURL : "http://127.0.0.1:9081", authorization: null, httpGet: function (url , success , error , object) { var xhr = cc.loader.getXMLHttpRequest();