woso_javan 1 mês atrás
pai
commit
1d35458add

+ 304 - 76
assets/module_aliens/Prefabs/Levels/level_1.prefab

@@ -31,20 +31,20 @@
         "__id__": 193
       },
       {
-        "__id__": 218
+        "__id__": 229
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 223
+        "__id__": 234
       },
       {
-        "__id__": 225
+        "__id__": 236
       }
     ],
     "_prefab": {
-      "__id__": 227
+      "__id__": 238
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2054,9 +2054,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.000017089843765916157,
-      "y": 0.18989208984373818,
-      "z": -0.007110644340515115
+      "x": 0.000030517578125,
+      "y": 0.18988037109375,
+      "z": -0.007110595703125
     }
   },
   {
@@ -2559,7 +2559,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 217
+      "__id__": 228
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2623,52 +2623,280 @@
       "__id__": 1
     },
     "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
+    "mountedComponents": [
       {
         "__id__": 197
+      }
+    ],
+    "propertyOverrides": [
+      {
+        "__id__": 208
       },
       {
-        "__id__": 199
+        "__id__": 210
       },
       {
-        "__id__": 200
+        "__id__": 211
       },
       {
-        "__id__": 201
+        "__id__": 212
       },
       {
-        "__id__": 202
+        "__id__": 213
       },
       {
-        "__id__": 204
+        "__id__": 215
       },
       {
-        "__id__": 206
+        "__id__": 217
       },
       {
-        "__id__": 208
+        "__id__": 219
       },
       {
-        "__id__": 210
+        "__id__": 221
       },
       {
-        "__id__": 212
+        "__id__": 223
       },
       {
-        "__id__": 214
+        "__id__": 225
       },
       {
-        "__id__": 216
+        "__id__": 227
       }
     ],
     "removedComponents": []
   },
   {
-    "__type__": "CCPropertyOverrideInfo",
+    "__type__": "cc.MountedComponentsInfo",
     "targetInfo": {
       "__id__": 198
     },
+    "components": [
+      {
+        "__id__": 199
+      },
+      {
+        "__id__": 204
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "6fQSw2v2FTB5TjrAIbcqcc"
+    ]
+  },
+  {
+    "__type__": "cc.RigidBody",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "mountedRoot": {
+        "__id__": 194
+      }
+    },
+    "node": {
+      "__id__": 200
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 207
+    },
+    "_group": 1,
+    "_type": 2,
+    "_mass": 1,
+    "_allowSleep": true,
+    "_linearDamping": 0.1,
+    "_angularDamping": 0.1,
+    "_useGravity": true,
+    "_linearFactor": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_angularFactor": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "convert1.002",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 194
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 201
+      },
+      {
+        "__id__": 199
+      },
+      {
+        "__id__": 204
+      }
+    ],
+    "_prefab": {
+      "__id__": 206
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -5.344,
+      "y": 0,
+      "z": -10.784
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": -2.6692544394972876e-8,
+      "y": 0.7071067513842247,
+      "z": 2.669254261861608e-8,
+      "w": 0.7071068109888681
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 164.1739501953125,
+      "y": 164.1739501953125,
+      "z": 164.1739501953125
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": -0.000004325711839002091,
+      "y": 89.99999517032704,
+      "z": 3.837964652054706e-14
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.MeshRenderer",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 200
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 202
+    },
+    "_materials": [
+      {
+        "__uuid__": "85ace8fc-a2e4-4e8b-9471-44c141f8ade4@430d9",
+        "__expectedType__": "cc.Material"
+      }
+    ],
+    "_visFlags": 0,
+    "bakeSettings": {
+      "__id__": 203
+    },
+    "_mesh": {
+      "__uuid__": "85ace8fc-a2e4-4e8b-9471-44c141f8ade4@4f026",
+      "__expectedType__": "cc.Mesh"
+    },
+    "_shadowCastingMode": 1,
+    "_shadowReceivingMode": 1,
+    "_shadowBias": 0,
+    "_shadowNormalBias": 0,
+    "_reflectionProbeId": -1,
+    "_reflectionProbeBlendId": -1,
+    "_reflectionProbeBlendWeight": 0,
+    "_enabledGlobalStandardSkinObject": false,
+    "_enableMorph": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a9/jk9G59YlJb7e20nN5tl"
+  },
+  {
+    "__type__": "cc.ModelBakeSettings",
+    "texture": null,
+    "uvParam": {
+      "__type__": "cc.Vec4",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    },
+    "_bakeable": false,
+    "_castShadow": true,
+    "_receiveShadow": true,
+    "_recieveShadow": true,
+    "_lightmapSize": 64,
+    "_useLightProbe": false,
+    "_bakeToLightProbe": true,
+    "_reflectionProbeType": 0,
+    "_bakeToReflectionProbe": true
+  },
+  {
+    "__type__": "cc.BoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "mountedRoot": {
+        "__id__": 194
+      }
+    },
+    "node": {
+      "__id__": 200
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 205
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_size": {
+      "__type__": "cc.Vec3",
+      "x": 0.3,
+      "y": 0.001,
+      "z": 0.2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8eAv31bRVHi4S0DIDmmYR6"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "6fQSw2v2FTB5TjrAIbcqcc",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "95vm4ozm9EBKI/9BITUKeG"
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 209
+    },
     "propertyPath": [
       "_name"
     ],
@@ -2683,7 +2911,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 198
+      "__id__": 209
     },
     "propertyPath": [
       "_lpos"
@@ -2698,7 +2926,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 198
+      "__id__": 209
     },
     "propertyPath": [
       "_lrot"
@@ -2714,7 +2942,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 198
+      "__id__": 209
     },
     "propertyPath": [
       "_euler"
@@ -2729,7 +2957,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 203
+      "__id__": 214
     },
     "propertyPath": [
       "_materials",
@@ -2749,7 +2977,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 205
+      "__id__": 216
     },
     "propertyPath": [
       "_materials",
@@ -2769,7 +2997,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 207
+      "__id__": 218
     },
     "propertyPath": [
       "_materials",
@@ -2789,7 +3017,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 209
+      "__id__": 220
     },
     "propertyPath": [
       "_materials",
@@ -2809,7 +3037,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 211
+      "__id__": 222
     },
     "propertyPath": [
       "_materials",
@@ -2829,7 +3057,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 213
+      "__id__": 224
     },
     "propertyPath": [
       "_materials",
@@ -2849,7 +3077,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 215
+      "__id__": 226
     },
     "propertyPath": [
       "_lpos"
@@ -2870,7 +3098,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 215
+      "__id__": 226
     },
     "propertyPath": [
       "_active"
@@ -2902,11 +3130,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 219
+        "__id__": 230
       }
     ],
     "_prefab": {
-      "__id__": 222
+      "__id__": 233
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2943,11 +3171,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 218
+      "__id__": 229
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 220
+      "__id__": 231
     },
     "_color": {
       "__type__": "cc.Color",
@@ -2959,7 +3187,7 @@
     "_useColorTemperature": false,
     "_colorTemperature": 6550,
     "_staticSettings": {
-      "__id__": 221
+      "__id__": 232
     },
     "_visibility": -325058561,
     "_illuminanceHDR": 65000,
@@ -3017,7 +3245,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 224
+      "__id__": 235
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3045,7 +3273,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 226
+      "__id__": 237
     },
     "camera": {
       "__id__": 19
@@ -3073,40 +3301,40 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 228
+        "__id__": 239
       },
       {
-        "__id__": 231
+        "__id__": 242
       },
       {
-        "__id__": 234
+        "__id__": 245
       },
       {
-        "__id__": 237
+        "__id__": 248
       },
       {
-        "__id__": 240
+        "__id__": 251
       },
       {
-        "__id__": 243
+        "__id__": 254
       },
       {
-        "__id__": 246
+        "__id__": 257
       },
       {
-        "__id__": 249
+        "__id__": 260
       },
       {
-        "__id__": 252
+        "__id__": 263
       },
       {
-        "__id__": 255
+        "__id__": 266
       },
       {
-        "__id__": 258
+        "__id__": 269
       },
       {
-        "__id__": 261
+        "__id__": 272
       }
     ],
     "nestedPrefabInstanceRoots": [
@@ -3136,7 +3364,7 @@
       "__id__": 141
     },
     "sourceInfo": {
-      "__id__": 229
+      "__id__": 240
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3145,7 +3373,7 @@
       "__id__": 141
     },
     "targetInfo": {
-      "__id__": 230
+      "__id__": 241
     }
   },
   {
@@ -3168,7 +3396,7 @@
       "__id__": 141
     },
     "sourceInfo": {
-      "__id__": 232
+      "__id__": 243
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3177,7 +3405,7 @@
       "__id__": 141
     },
     "targetInfo": {
-      "__id__": 233
+      "__id__": 244
     }
   },
   {
@@ -3200,7 +3428,7 @@
       "__id__": 141
     },
     "sourceInfo": {
-      "__id__": 235
+      "__id__": 246
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3209,7 +3437,7 @@
       "__id__": 141
     },
     "targetInfo": {
-      "__id__": 236
+      "__id__": 247
     }
   },
   {
@@ -3232,7 +3460,7 @@
       "__id__": 141
     },
     "sourceInfo": {
-      "__id__": 238
+      "__id__": 249
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3241,7 +3469,7 @@
       "__id__": 141
     },
     "targetInfo": {
-      "__id__": 239
+      "__id__": 250
     }
   },
   {
@@ -3264,7 +3492,7 @@
       "__id__": 23
     },
     "sourceInfo": {
-      "__id__": 241
+      "__id__": 252
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3273,7 +3501,7 @@
       "__id__": 23
     },
     "targetInfo": {
-      "__id__": 242
+      "__id__": 253
     }
   },
   {
@@ -3296,7 +3524,7 @@
       "__id__": 23
     },
     "sourceInfo": {
-      "__id__": 244
+      "__id__": 255
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3305,7 +3533,7 @@
       "__id__": 23
     },
     "targetInfo": {
-      "__id__": 245
+      "__id__": 256
     }
   },
   {
@@ -3328,7 +3556,7 @@
       "__id__": 23
     },
     "sourceInfo": {
-      "__id__": 247
+      "__id__": 258
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3337,7 +3565,7 @@
       "__id__": 23
     },
     "targetInfo": {
-      "__id__": 248
+      "__id__": 259
     }
   },
   {
@@ -3360,7 +3588,7 @@
       "__id__": 23
     },
     "sourceInfo": {
-      "__id__": 250
+      "__id__": 261
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3369,7 +3597,7 @@
       "__id__": 23
     },
     "targetInfo": {
-      "__id__": 251
+      "__id__": 262
     }
   },
   {
@@ -3392,7 +3620,7 @@
       "__id__": 67
     },
     "sourceInfo": {
-      "__id__": 253
+      "__id__": 264
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3401,7 +3629,7 @@
       "__id__": 67
     },
     "targetInfo": {
-      "__id__": 254
+      "__id__": 265
     }
   },
   {
@@ -3424,7 +3652,7 @@
       "__id__": 67
     },
     "sourceInfo": {
-      "__id__": 256
+      "__id__": 267
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3433,7 +3661,7 @@
       "__id__": 67
     },
     "targetInfo": {
-      "__id__": 257
+      "__id__": 268
     }
   },
   {
@@ -3456,7 +3684,7 @@
       "__id__": 67
     },
     "sourceInfo": {
-      "__id__": 259
+      "__id__": 270
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3465,7 +3693,7 @@
       "__id__": 67
     },
     "targetInfo": {
-      "__id__": 260
+      "__id__": 271
     }
   },
   {
@@ -3488,7 +3716,7 @@
       "__id__": 67
     },
     "sourceInfo": {
-      "__id__": 262
+      "__id__": 273
     },
     "propertyPath": [
       "_skinningRoot"
@@ -3497,7 +3725,7 @@
       "__id__": 67
     },
     "targetInfo": {
-      "__id__": 263
+      "__id__": 274
     }
   },
   {

Diferenças do arquivo suprimidas por serem muito extensas
+ 706 - 315
assets/module_aliens/Prefabs/Levels/level_2.prefab


+ 1 - 1
assets/module_aliens/Prefabs/Levels/level_2.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "cd016e58-b005-459a-b3dc-4fecf918e910",
+  "uuid": "4016d2f3-3394-44fc-bad6-360527bec65d",
   "files": [
     ".json"
   ],

+ 2 - 1
assets/module_aliens/Script/Components/EnemyComponent.ts

@@ -3,7 +3,7 @@ import { EventDispatcher } from 'db://assets/core_tgx/easy_ui_framework/EventDis
 import { GameEvent } from '../Enum/GameEvent';
 import { GameUtil } from '../GameUtil';
 
-const { ccclass, property } = _decorator;
+const { ccclass, property,executeInEditMode } = _decorator;
 
 export enum EnemyStatus {
     LIFE,
@@ -11,6 +11,7 @@ export enum EnemyStatus {
 }
 
 @ccclass('EnemyComponent')
+@executeInEditMode
 export class EnemyComponent extends Component {
 
     @property(RigidBody)

+ 9 - 1
assets/module_aliens/Script/LevelAction.ts

@@ -1,4 +1,4 @@
-import { _decorator, BoxCollider2D, Button, Camera, CCFloat, CircleCollider2D, Color, Component, debug, DebugView, director, EventTouch, find, geometry, Input, input, math, Node, NodeEventType, PhysicsSystem, Quat, RenderTexture, Tween, tween, v3, Vec3, view } from 'cc';
+import { _decorator, BoxCollider2D, Button, Camera, CCFloat, CircleCollider2D, Color, Component, debug, DebugView, director, EventTouch, find, geometry, Input, input, Label, math, Node, NodeEventType, PhysicsSystem, Quat, RenderTexture, Tween, tween, v3, Vec3, view } from 'cc';
 import { EventDispatcher } from '../../core_tgx/easy_ui_framework/EventDispatcher';
 import { GameEvent } from './Enum/GameEvent';
 import { LineDrawer } from './LineDrawer';
@@ -73,6 +73,14 @@ export class LevelAction extends Component {
         if (!match) {
             tgxUIMgr.inst.showUI(UI_BattleGambit);
         }
+
+        this.updateLvlTitle();
+    }
+
+    private updateLvlTitle(){
+        const lvlTitle = AliensGlobalInstance.instance.titleLvl;
+        const level = LevelManager.instance.levelModel.level;
+        lvlTitle.getChildByName('LbLvl').getComponent(Label).string = `${level}`;
     }
 
     private registerEvent() {

+ 4 - 4
assets/module_aliens/rooster_aliens.scene

@@ -2958,8 +2958,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 38.46,
-      "height": 50
+      "width": 23.189453125,
+      "height": 67
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2998,8 +2998,8 @@
     "_overflow": 0,
     "_enableWrapText": false,
     "_font": {
-      "__uuid__": "1f79fc84-95f3-4392-9c73-004659a41d9f",
-      "__expectedType__": "cc.LabelAtlas"
+      "__uuid__": "23a47957-4ba6-41f7-999f-a5fbf8a48aed",
+      "__expectedType__": "cc.TTFFont"
     },
     "_isSystemFontUsed": false,
     "_spacingX": 0,

+ 1 - 1
profiles/v2/packages/scene.json

@@ -5,7 +5,7 @@
     "__version__": "1.3.7"
   },
   "gizmos-infos": {
-    "is2D": false,
+    "is2D": true,
     "is3DIcon": false,
     "iconSize": 2,
     "gridVisible": true,

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff