diff --git a/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_02.png b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_02.png new file mode 100755 index 0000000..1a55543 Binary files /dev/null and b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_02.png differ diff --git a/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_02.png.meta b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_02.png.meta new file mode 100644 index 0000000..598cb85 --- /dev/null +++ b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_02.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "45b60d84-77d7-46e3-8d6f-cfbab45d148d", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "45b60d84-77d7-46e3-8d6f-cfbab45d148d@6c48a", + "displayName": "zxk_02", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "45b60d84-77d7-46e3-8d6f-cfbab45d148d", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "45b60d84-77d7-46e3-8d6f-cfbab45d148d@f9941", + "displayName": "zxk_02", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 417, + "height": 434, + "rawWidth": 417, + "rawHeight": 434, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -208.5, + -217, + 0, + 208.5, + -217, + 0, + -208.5, + 217, + 0, + 208.5, + 217, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 434, + 417, + 434, + 0, + 0, + 417, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -208.5, + -217, + 0 + ], + "maxPos": [ + 208.5, + 217, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "45b60d84-77d7-46e3-8d6f-cfbab45d148d@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "45b60d84-77d7-46e3-8d6f-cfbab45d148d@6c48a" + } +} diff --git a/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_03.png b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_03.png new file mode 100755 index 0000000..21e55e6 Binary files /dev/null and b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_03.png differ diff --git a/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_03.png.meta b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_03.png.meta new file mode 100644 index 0000000..90385f5 --- /dev/null +++ b/assets/Game/carTextures/rp_10012标志之旅/咨询框/zxk_03.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "cbd632f4-2d12-47e2-8597-80b8ab160cb9", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "cbd632f4-2d12-47e2-8597-80b8ab160cb9@6c48a", + "displayName": "zxk_03", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "cbd632f4-2d12-47e2-8597-80b8ab160cb9", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "cbd632f4-2d12-47e2-8597-80b8ab160cb9@f9941", + "displayName": "zxk_03", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 417, + "height": 654, + "rawWidth": 417, + "rawHeight": 654, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -208.5, + -327, + 0, + 208.5, + -327, + 0, + -208.5, + 327, + 0, + 208.5, + 327, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 654, + 417, + 654, + 0, + 0, + 417, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -208.5, + -327, + 0 + ], + "maxPos": [ + 208.5, + 327, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cbd632f4-2d12-47e2-8597-80b8ab160cb9@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "cbd632f4-2d12-47e2-8597-80b8ab160cb9@6c48a" + } +} diff --git a/assets/Game/prefabs/Game/iconMsg.prefab b/assets/Game/prefabs/Game/iconMsg.prefab index 0be5baf..c32a12c 100644 --- a/assets/Game/prefabs/Game/iconMsg.prefab +++ b/assets/Game/prefabs/Game/iconMsg.prefab @@ -776,7 +776,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 45, + "y": 52.5, "z": 0 }, "_lrot": { @@ -1195,7 +1195,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 15, + "y": 17.5, "z": 0 }, "_lrot": { @@ -1614,7 +1614,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -15, + "y": -17.5, "z": 0 }, "_lrot": { @@ -2033,7 +2033,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -45, + "y": -52.5, "z": 0 }, "_lrot": { @@ -2439,7 +2439,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 120 + "height": 135 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2477,7 +2477,7 @@ "_paddingTop": 0, "_paddingBottom": 0, "_spacingX": 0, - "_spacingY": 0, + "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, @@ -2845,7 +2845,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 114.775, + "x": 170, "y": 0, "z": 0 }, @@ -3816,7 +3816,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 45, + "y": 52.5, "z": 0 }, "_lrot": { @@ -4235,7 +4235,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 15, + "y": 17.5, "z": 0 }, "_lrot": { @@ -4654,7 +4654,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -15, + "y": -17.5, "z": 0 }, "_lrot": { @@ -5073,7 +5073,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -45, + "y": -52.5, "z": 0 }, "_lrot": { @@ -5479,7 +5479,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 120 + "height": 135 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5517,7 +5517,7 @@ "_paddingTop": 0, "_paddingBottom": 0, "_spacingX": 0, - "_spacingY": 0, + "_spacingY": 5, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, @@ -5885,7 +5885,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -103.636, + "x": -170, "y": 0, "z": 0 }, @@ -6192,6 +6192,20 @@ "rightNode": { "__id__": 128 }, + "zxkSpriteFraems": [ + { + "__uuid__": "14d81c3e-0044-42bc-89e2-8899b23429a9@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45b60d84-77d7-46e3-8d6f-cfbab45d148d@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cbd632f4-2d12-47e2-8597-80b8ab160cb9@f9941", + "__expectedType__": "cc.SpriteFrame" + } + ], "_id": "" }, { diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 04e958b..f3906e9 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7fn3a2Mu9BHbdrxvr+Iu2P" + "fileId": "1fmzVW9GBKvKac6Qunfnaw" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "f3C6/VVf9IKoOnsA2xsNsb", + "fileId": "c94raEU9dOB7MIGqVgXzcl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "70zhI3z+dDZLMKAGXcKvz6" + "fileId": "660u9LASBFb4Zx1CSQ8wm3" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "1aHLO88E5FQ4+hUfqYq2cF", + "fileId": "35eWSNwvBCh4Q6QTKiHNK9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bbBUgTjiFAXIewYE8ygMgO" + "fileId": "a6dXC3YuxAx5yCII1HSCyV" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0dAzKQHcVM1oih/MtvZqle" + "fileId": "1dOavwnNdPYbUQ3esT/bsq" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "73j3l0a1tNh4tZXRv8njGA", + "fileId": "828j65WcpLFZM5wVbeIvPM", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7fBaRA6rJCvrkfbxZgRoES" + "fileId": "c69xByCH5Jmp7x/Vt+fwiM" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "71LKLovCVEQLZ8n/TRNtAP" + "fileId": "dapmAgjflEs6e57U4g9Afu" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e06iEhgJ1PbKvKv6WVSXaM" + "fileId": "1avFjv6YhLBLaurVFK8G4S" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "cc7/4OTe5JVY744i1AxxeO", + "fileId": "11bZp36qFEj6nj56XolX90", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6dbGePKJNARIZ49QS43d9C" + "fileId": "a47oXosz1N8JLslvCX+/df" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "f2cHYgod1JxK+IYH22+wWY", + "fileId": "16FBaO5ulID7xOs6JowpZ9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9bFQEqEXBELaGph/BK2JNJ" + "fileId": "bfV3ovHuZMO5dNLYw4zrIL" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "e45mr2f8xBGq3B4lI58Kgw", + "fileId": "bbSqtTphxEh6qsuM05U2hF", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cc4J0/hN5EgZJSGHcvdjpr" + "fileId": "f1MeX9MrZBKacTuV88QMgE" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b45LHElSlASYCh05jckuXL" + "fileId": "0bRkQtZ2dJlLN1r4JRR8We" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "440ULiC8dG1qhzsBhdh+c/", + "fileId": "ffx0pFC9VEYLneXZ1Ub2WA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "beI7o4QTpA9Ki9HkJBj1kP" + "fileId": "ceAssZikRMLIOSiMk+X0nx" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "73DnHrGENIt6sNpLFzu0tY", + "fileId": "74Org60ZBEeqeSHnFq2Ukp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09LchDhqVBCYqz+FQsENqP" + "fileId": "11j2OymhFGOJcEDldScBah" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "ffAr8OHkdLxpTcWbw48n19", + "fileId": "9fZGY2Q9RK4KzVNn+CezA+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "37wzcgBYFIjqdWtWZ6p8tQ" + "fileId": "d9P2Y2geZJ/otmlsADD+5/" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e2okmUeOZKQY48y1J4P4O6" + "fileId": "84eMt4g6BBBoBTErOdxfr3" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "00ltbv4JFP6JFiVvnTrJul", + "fileId": "ffEg+PNcdLpa5axafviVLg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "688qRFkNFIpbg3KJDQ8fZ9" + "fileId": "d6FNOC7dVMvLwYRWwIwaF6" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "68X8JXCwFLT7cd+tglaOG/", + "fileId": "61uuh61QVKsZaZqd28rklU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a4zMBvlgJLa5bisnHJbJhf" + "fileId": "45nK+qGm9GyLzsXTwER/iu" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "a3NfGhdxFI/6wKgG/a7VGJ", + "fileId": "b3aQ4X9EZFp7E6XGv3HIbO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9dE885G6tA45w8wyZfWeKB" + "fileId": "17wMSyIFFKMIVoeJzCUTR+" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a8CeZgam1C3I8v27VbGwO1" + "fileId": "0dlUOwC25FOotRsXDhkYmj" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "56KX7Nm0lOCKOYs+jsece0", + "fileId": "cfSmWgW6tJqIPArwaNU5mB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fbnWFyprdO8YVUURCp1jgQ" + "fileId": "d6YkAw6hZAkowY4XZiVSC8" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "56EznhXV5LYKt42OtOHgDc", + "fileId": "87aT7aDY9BLKg8JOutghsV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9aNbHnRwJHJ4cDgixjd4QB" + "fileId": "1cHqpO3WpKNI49kxmpGetP" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "7brGaeHq5B1p2TOS4AQETy", + "fileId": "3b5h+4NB1JpbVKqAFB4uCA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "46BNMMEm9CfaxYLsFvpfqi" + "fileId": "2c3LsDGHNNobIX63da58Zb" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07XUOXfRVLPapAkLtBHQzp" + "fileId": "86Tx6hT31PNr19ubjilrHx" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "d700hyHL1KYb1M7q99GlUM", + "fileId": "66RSPD531BZ4X8B7RPPc0U", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ebNz+c7hJIF5ZXpwsvMwnK" + "fileId": "aaRg78oi1PCYy8eSWb3pyr" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "ebI81Ktj1OzId5b+SkVgdD", + "fileId": "2bGQql0LJA1INM5rD+gj6t", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "56Lx+5mLFAarEwquJnSSKr" + "fileId": "bbOPTjV65P/pTM6CViHujF" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "45VXnfrOVEmok9oE8dGHIu", + "fileId": "d0/eBZVdNHjb5IhEp/S99j", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8dm+yq5YhDWYrrQFgnweAn" + "fileId": "64wy87GDdLMY6L9t1yokRs" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d2cdzAliFNjYpV+gNHKcPp" + "fileId": "83aEUqpGxMLo4HkpEdePY9" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "432EbG0CpDfbf2foNHXL4c", + "fileId": "03Dt4CAh1AM51ZTS+Z/sly", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a5XHXU2qpLKbWa44l0d+gF" + "fileId": "87dkDgkFlHeJIAIIXeUUCg" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "62gihCq4VL+JXta7sdBi8B", + "fileId": "64MEFJhQBBDoDEc58EmuPQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "daqejtom1O/rvKyqNpqtsT" + "fileId": "ec6uU4/F9IrJAuW5G03oVs" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "b7Q6isDo5Lo4ifUdL4H6ei", + "fileId": "dc40xX4kBNk7YW6OoDUy9I", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "95wMBA/NxHcrKmKEhoHmn4" + "fileId": "8efqkWJ+JJZYysU1OL/BsE" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "feWFs6NvFJhq89jZiO8A0m" + "fileId": "555bzzi25Drohln5w4Fh12" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "f7D1EDuM1Pkb5QXMNWw4aJ", + "fileId": "48P+hfImNOX6L8Bz6PgWjZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c71shaczdM2prfzmYpeRJ1" + "fileId": "51tfJCd8lM7LIqOsXIo37q" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dqUfeWShFZqQFlSvU3ZC1" + "fileId": "7bdfCG5SZDjrKVFDjrFVgi" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "69R63BG/5J0qsceInuVFIZ" + "fileId": "5edRgGcgpGibXI0ZcYRwGb" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "bfMCKOUM9LWadg5/TcIhuR", + "fileId": "95qqXyFb5Bub3OkgJRCngF", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -7492,7 +7492,7 @@ "node": { "__id__": 309 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 327 }, diff --git a/assets/Game/scripts/game/IconMsg.ts b/assets/Game/scripts/game/IconMsg.ts index 392b87c..6a94e37 100644 --- a/assets/Game/scripts/game/IconMsg.ts +++ b/assets/Game/scripts/game/IconMsg.ts @@ -13,6 +13,8 @@ export class IconMsg extends Component { @property(Node) rightNode: Node = null; + @property([SpriteFrame]) + zxkSpriteFraems: Array = new Array iconComponent: Icon = null; @@ -57,6 +59,11 @@ export class IconMsg extends Component { this.ui_payout_scatter = this.leftNode.getChildByName('ui_payout_scatter'); this.ui_payout_multi = this.leftNode.getChildByName('ui_payout_multi'); + this.ui_payout.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.ui_payout_wild.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.ui_payout_scatter.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.ui_payout_multi.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.multi = this.leftNode.getChildByName('multi'); this.sprite_wild = this.leftNode.getChildByName('sprite_wild'); this.sprite_scatter = this.leftNode.getChildByName('sprite_scatter'); @@ -73,6 +80,11 @@ export class IconMsg extends Component { this.right_ui_payout_scatter = this.rightNode.getChildByName('ui_payout_scatter'); this.right_ui_payout_multi = this.rightNode.getChildByName('ui_payout_multi'); + this.right_ui_payout.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.right_ui_payout_wild.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.right_ui_payout_scatter.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.right_ui_payout_multi.getComponent(Sprite).spriteFrame = this.zxkSpriteFraems[iconComponent.lHeight - 1] + this.right_multi = this.rightNode.getChildByName('multi'); this.right_sprite_wild = this.rightNode.getChildByName('sprite_wild'); this.right_sprite_scatter = this.rightNode.getChildByName('sprite_scatter'); diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index 421c547..442fa46 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -27,7 +27,7 @@ export function getHistoryUrl() { } export function getLanguage() { - return 'zh'; + // return 'zh'; return language; }