Merge branch 'master' of http://120.92.132.192:23541/TDGame/TDGameClient3D

assets/d3d.meta

@@ -6,6 +6,6 @@
   "files": [],
   "subMetas": {},
   "userData": {
-    "isSubpackage": true
+    "isSubpackage": false
   }
 }

assets/d3d/barriers.meta

@@ -5,5 +5,7 @@
   "uuid": "08b9e280-4a59-47e2-98fb-7b2625062602",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/d3d/barriers/fences/lambert2.mtl

@@ -4,12 +4,12 @@
   "_objFlags": 0,
   "_native": "",
   "_effectAsset": {
-    "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc"
+    "__uuid__": "1baf0fc9-befa-459c-8bdd-af1a450a0319"
   },
   "_techIdx": 0,
   "_defines": [
     {
-      "USE_TEXTURE": true
+      "USE_ALBEDO_MAP": true
     }
   ],
   "_states": [
@@ -25,10 +25,10 @@
   ],
   "_props": [
     {
+      "alphaThreshold": 0,
       "mainTexture": {
         "__uuid__": "90d9ce53-bba7-4f74-aae2-cbcf3e7b1477@6c48a"
-      },
-      "alphaThreshold": 0
+      }
     }
   ]
 }

assets/d3d/gunFire.meta

@@ -5,5 +5,7 @@
   "uuid": "388802a1-c38d-4d02-b338-1eed79c1a0a6",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/d3d/ColorMaterial.mtl → assets/d3d/gunFire/zuodanlizi.mtl

@@ -4,9 +4,9 @@
   "_objFlags": 0,
   "_native": "",
   "_effectAsset": {
-    "__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc"
+    "__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0"
   },
-  "_techIdx": 0,
+  "_techIdx": 1,
   "_defines": [
     {}
   ],
@@ -23,12 +23,8 @@
   ],
   "_props": [
     {
-      "mainColor": {
-        "__type__": "cc.Color",
-        "r": 0,
-        "g": 255,
-        "b": 0,
-        "a": 255
+      "mainTexture": {
+        "__uuid__": "83610118-9164-4e54-bc67-660b28ba9610@6c48a"
       }
     }
   ]

assets/d3d/ColorMaterial.mtl.meta → assets/d3d/gunFire/zuodanlizi.mtl.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.9",
   "importer": "material",
   "imported": true,
-  "uuid": "c6f6ba64-b609-4944-a929-ef5fb12c053e",
+  "uuid": "e3f1912c-c797-4cb9-b62a-837d6396dd98",
   "files": [
     ".json"
   ],

assets/d3d/hands.meta

@@ -5,5 +5,7 @@
   "uuid": "1b8f4ac0-3f20-409d-aa0f-6b8abda6ac0e",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/d3d/monsters.meta

@@ -5,5 +5,7 @@
   "uuid": "c07c19b7-b847-4d0f-9e31-4c0bb0a4ae5b",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/d3d/monsters/monster001/Monster_anima.fbx.meta

@@ -89,7 +89,7 @@
         "sample": 30,
         "span": {
           "from": 2.7,
-          "to": 3.466666666666667
+          "to": 3.2666666666666666
         },
         "events": []
       }
@@ -313,7 +313,7 @@
           {
             "name": "Damage",
             "from": 2.7,
-            "to": 3.466666666666667,
+            "to": 3.2666666666666666,
             "wrapMode": 1
           },
           {

assets/d3d/scenes.meta

@@ -5,5 +5,7 @@
   "uuid": "1ea8d46f-afd4-4bef-b656-6cff72b38620",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/d3d/textures.meta

@@ -5,5 +5,7 @@
   "uuid": "6d82069d-405f-4158-bdd3-174479c5872f",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/d3d/textures/5555.png.meta

@@ -0,0 +1,40 @@
+{
+  "ver": "1.0.18",
+  "importer": "image",
+  "imported": true,
+  "uuid": "83610118-9164-4e54-bc67-660b28ba9610",
+  "files": [
+    ".png",
+    ".json"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "83610118-9164-4e54-bc67-660b28ba9610@6c48a",
+      "displayName": "5555",
+      "id": "6c48a",
+      "name": "texture",
+      "ver": "1.0.19",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "premultiplyAlpha": false,
+        "anisotropy": 1,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "83610118-9164-4e54-bc67-660b28ba9610"
+      }
+    }
+  },
+  "userData": {
+    "type": "texture",
+    "redirect": "83610118-9164-4e54-bc67-660b28ba9610@6c48a"
+  }
+}

assets/d3d/weapons.meta

@@ -5,5 +5,7 @@
   "uuid": "50d5c4fb-f016-4954-a292-741bb3ffd629",
   "files": [],
   "subMetas": {},
-  "userData": {}
+  "userData": {
+    "isSubpackage": true
+  }
 }

assets/resources/d3d/Particle.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "0.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "96ef60a4-4c0c-490c-b282-e97b8bf8d8cd",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/d3d/Particle/zhuodan.prefab

@@ -0,0 +1,641 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "zhuodan",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_prefab": {
+      "__id__": 52
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0.7071067811865475,
+      "y": 0,
+      "z": 0,
+      "w": 0.7071067811865476
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.337,
+      "y": 0.337,
+      "z": 0.337
+    },
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 90,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ParticleSystemComponent",
+    "_name": "Particle<ParticleSystemComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "e3f1912c-c797-4cb9-b62a-837d6396dd98"
+      },
+      null
+    ],
+    "_visFlags": 0,
+    "startColor": {
+      "__id__": 3
+    },
+    "scaleSpace": 1,
+    "startSize3D": false,
+    "startSizeX": {
+      "__id__": 4
+    },
+    "startSize": {
+      "__id__": 4
+    },
+    "startSizeY": {
+      "__id__": 5
+    },
+    "startSizeZ": {
+      "__id__": 6
+    },
+    "startSpeed": {
+      "__id__": 7
+    },
+    "startRotation3D": false,
+    "startRotationX": {
+      "__id__": 8
+    },
+    "startRotationY": {
+      "__id__": 9
+    },
+    "startRotationZ": {
+      "__id__": 10
+    },
+    "startRotation": {
+      "__id__": 10
+    },
+    "startDelay": {
+      "__id__": 11
+    },
+    "startLifetime": {
+      "__id__": 12
+    },
+    "duration": 1,
+    "loop": true,
+    "simulationSpeed": 1,
+    "playOnAwake": true,
+    "gravityModifier": {
+      "__id__": 13
+    },
+    "rateOverTime": {
+      "__id__": 14
+    },
+    "rateOverDistance": {
+      "__id__": 15
+    },
+    "bursts": [],
+    "_colorOverLifetimeModule": {
+      "__id__": 16
+    },
+    "_shapeModule": {
+      "__id__": 18
+    },
+    "_sizeOvertimeModule": {
+      "__id__": 20
+    },
+    "_velocityOvertimeModule": {
+      "__id__": 25
+    },
+    "_forceOvertimeModule": {
+      "__id__": 30
+    },
+    "_limitVelocityOvertimeModule": {
+      "__id__": 34
+    },
+    "_rotationOvertimeModule": {
+      "__id__": 39
+    },
+    "_textureAnimationModule": {
+      "__id__": 43
+    },
+    "_trailModule": {
+      "__id__": 46
+    },
+    "renderer": {
+      "__id__": 51
+    },
+    "enableCulling": false,
+    "_prewarm": false,
+    "_capacity": 1,
+    "_simulationSpace": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.GradientRange",
+    "_mode": 0,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 1,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0.1,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 1,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.ColorOvertimeModule",
+    "_enable": false,
+    "color": {
+      "__id__": 17
+    }
+  },
+  {
+    "__type__": "cc.GradientRange",
+    "_mode": 0,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "cc.ShapeModule",
+    "_enable": true,
+    "_shapeType": 2,
+    "shapeType": 2,
+    "emitFrom": 0,
+    "alignToDirection": false,
+    "randomDirectionAmount": 0,
+    "sphericalDirectionAmount": 0,
+    "randomPositionAmount": 0,
+    "radius": 1,
+    "radiusThickness": 1,
+    "arcMode": 0,
+    "arcSpread": 0,
+    "arcSpeed": {
+      "__id__": 19
+    },
+    "length": 5,
+    "boxThickness": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_rotation": {
+      "__type__": "cc.Vec3",
+      "x": 90,
+      "y": 90,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_arc": 6.283185307179586,
+    "_angle": 0.4363323129985824
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 1,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.SizeOvertimeModule",
+    "_enable": false,
+    "separateAxes": false,
+    "size": {
+      "__id__": 21
+    },
+    "x": {
+      "__id__": 22
+    },
+    "y": {
+      "__id__": 23
+    },
+    "z": {
+      "__id__": 24
+    }
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.VelocityOvertimeModule",
+    "_enable": false,
+    "x": {
+      "__id__": 26
+    },
+    "y": {
+      "__id__": 27
+    },
+    "z": {
+      "__id__": 28
+    },
+    "speedModifier": {
+      "__id__": 29
+    },
+    "space": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 1,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.ForceOvertimeModule",
+    "_enable": false,
+    "x": {
+      "__id__": 31
+    },
+    "y": {
+      "__id__": 32
+    },
+    "z": {
+      "__id__": 33
+    },
+    "space": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.LimitVelocityOvertimeModule",
+    "_enable": false,
+    "limitX": {
+      "__id__": 35
+    },
+    "limitY": {
+      "__id__": 36
+    },
+    "limitZ": {
+      "__id__": 37
+    },
+    "limit": {
+      "__id__": 38
+    },
+    "dampen": 3,
+    "separateAxes": false,
+    "space": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.RotationOvertimeModule",
+    "_enable": false,
+    "_separateAxes": false,
+    "x": {
+      "__id__": 40
+    },
+    "y": {
+      "__id__": 41
+    },
+    "z": {
+      "__id__": 42
+    }
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.TextureAnimationModule",
+    "_enable": true,
+    "_numTilesX": 3,
+    "numTilesX": 3,
+    "_numTilesY": 1,
+    "numTilesY": 1,
+    "_mode": 0,
+    "animation": 0,
+    "frameOverTime": {
+      "__id__": 44
+    },
+    "startFrame": {
+      "__id__": 45
+    },
+    "cycleCount": 1,
+    "_flipU": 0,
+    "_flipV": 0,
+    "_uvChannelMask": -1,
+    "randomRow": false,
+    "rowIndex": 0
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 1,
+    "curve": {
+      "__type__": "cc.AnimationCurve",
+      "preWrapMode": 2,
+      "postWrapMode": 2,
+      "keyFrames": [
+        {
+          "__type__": "cc.Keyframe",
+          "time": 0,
+          "value": 0,
+          "inTangent": 1,
+          "outTangent": 1
+        },
+        {
+          "__type__": "cc.Keyframe",
+          "time": 1,
+          "value": 1,
+          "inTangent": 1,
+          "outTangent": 1
+        }
+      ]
+    },
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.TrailModule",
+    "_enable": false,
+    "mode": 0,
+    "lifeTime": {
+      "__id__": 47
+    },
+    "_minParticleDistance": 0.1,
+    "existWithParticles": true,
+    "textureMode": 0,
+    "widthFromParticle": true,
+    "widthRatio": {
+      "__id__": 48
+    },
+    "colorFromParticle": false,
+    "colorOverTrail": {
+      "__id__": 49
+    },
+    "colorOvertime": {
+      "__id__": 50
+    },
+    "_space": 0,
+    "_particleSystem": {
+      "__id__": 2
+    }
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 1,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.CurveRange",
+    "mode": 0,
+    "constant": 0,
+    "multiplier": 1
+  },
+  {
+    "__type__": "cc.GradientRange",
+    "_mode": 0,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "cc.GradientRange",
+    "_mode": 0,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "cc.ParticleSystemRenderer",
+    "_renderMode": 0,
+    "_velocityScale": 1,
+    "_lengthScale": 1,
+    "_mesh": null,
+    "_mainTexture": {
+      "__uuid__": "83610118-9164-4e54-bc67-660b28ba9610@6c48a"
+    },
+    "_useGPU": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "31u45JhTNEE6Vj5BH4gSHQ",
+    "sync": false,
+    "_synced": {
+      "default": false,
+      "serializable": false
+    }
+  }
+]

assets/resources/d3d/Particle/zhuodan.prefab.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.0.29",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "c9cd5b63-55c1-4b4b-a879-565594c3984f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/scenes/FightingScene.scene

@@ -2732,10 +2732,10 @@
     },
     "_lrot": {
       "__type__": "cc.Quat",
-      "x": -0.8512159994779166,
-      "y": 0.049309874198381606,
-      "z": 0.10919649869523013,
-      "w": 0.5109559503636826
+      "x": -0.44272058798391334,
+      "y": 0.10030682333725705,
+      "z": 0.06552770568809746,
+      "w": 0.8886186707212608
     },
     "_lscale": {
       "__type__": "cc.Vec3",
@@ -2746,7 +2746,7 @@
     "_layer": 1073741824,
     "_euler": {
       "__type__": "cc.Vec3",
-      "x": -118.24,
+      "x": -53.156,
       "y": 13.673,
       "z": 1.584
     },

assets/resources/scenes/PreloadingScene.scene

@@ -30,7 +30,7 @@
     "_prefab": null,
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 61
+      "__id__": 62
     },
     "_id": "9916a420-a917-4e24-b00b-1a7d12964c38"
   },
@@ -217,10 +217,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 60
       },
       {
-        "__id__": 60
+        "__id__": 61
       }
     ],
     "_prefab": null,
@@ -273,10 +273,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 58
       },
       {
-        "__id__": 58
+        "__id__": 59
       }
     ],
     "_prefab": null,
@@ -1391,21 +1391,18 @@
     "_children": [
       {
         "__id__": 44
-      },
-      {
-        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 54
-      },
       {
         "__id__": 55
       },
       {
         "__id__": 56
+      },
+      {
+        "__id__": 57
       }
     ],
     "_prefab": null,
@@ -1447,18 +1444,24 @@
     "_children": [
       {
         "__id__": 45
+      },
+      {
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 49
+        "__id__": 52
       },
       {
-        "__id__": 50
+        "__id__": 53
+      },
+      {
+        "__id__": 54
       }
     ],
     "_prefab": null,
@@ -1593,102 +1596,28 @@
     "_atlas": null,
     "_id": "afiba1PENFir6Qja9cCI65"
   },
-  {
-    "__type__": "cc.UITransformComponent",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 44
-    },
-    "_enabled": true,
-    "_priority": 0,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 300,
-      "height": 15
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": "05HqOIANtHjrYaZvn5Rv/n"
-  },
-  {
-    "__type__": "cc.SpriteComponent",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 44
-    },
-    "_enabled": true,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_sharedMaterial": null,
-    "_spriteFrame": {
-      "__uuid__": "9fd900dd-221b-4f89-8f2c-fba34243c835@f9941"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": "e1V9FZ99lPH7+8wgbgVrn9"
-  },
-  {
-    "__type__": "cc.ProgressBarComponent",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 44
-    },
-    "_enabled": true,
-    "_barSprite": {
-      "__id__": 47
-    },
-    "_mode": 0,
-    "_totalLength": 300,
-    "_progress": 0.5,
-    "_reverse": false,
-    "_id": "c453aDEWlLrIDgTBCKFPnU"
-  },
   {
     "__type__": "cc.Node",
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 44
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 49
       },
       {
-        "__id__": 53
+        "__id__": 50
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 55.062,
+      "y": 55.06200000000001,
       "z": 0
     },
     "_lrot": {
@@ -1718,13 +1647,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 48
     },
     "_enabled": true,
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 138.61,
+      "width": 277.23,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1739,7 +1668,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 48
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1756,8 +1685,8 @@
     "_string": "PreloadingView",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -1770,6 +1699,108 @@
     "_cacheMode": 0,
     "_id": "a5bFWemoxPr4LZhN//G1AT"
   },
+  {
+    "__type__": "cc.UITransformComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 44
+    },
+    "_enabled": true,
+    "_priority": 0,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 300,
+      "height": 15
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": "05HqOIANtHjrYaZvn5Rv/n"
+  },
+  {
+    "__type__": "cc.SpriteComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 44
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_sharedMaterial": null,
+    "_spriteFrame": {
+      "__uuid__": "9fd900dd-221b-4f89-8f2c-fba34243c835@f9941"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": "e1V9FZ99lPH7+8wgbgVrn9"
+  },
+  {
+    "__type__": "cc.ProgressBarComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 44
+    },
+    "_enabled": true,
+    "_barSprite": {
+      "__id__": 47
+    },
+    "_mode": 0,
+    "_totalLength": 300,
+    "_progress": 0.5,
+    "_reverse": false,
+    "_id": "c453aDEWlLrIDgTBCKFPnU"
+  },
+  {
+    "__type__": "cc.WidgetComponent",
+    "_name": "ProgressBar<WidgetComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 44
+    },
+    "_enabled": true,
+    "_alignFlags": 18,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": "5bjQFxPWFFKIREUtiWeFhF"
+  },
   {
     "__type__": "cc.UITransformComponent",
     "_name": "",
@@ -1828,10 +1859,10 @@
     },
     "_enabled": true,
     "pregressBar": {
-      "__id__": 50
+      "__id__": 53
     },
     "label": {
-      "__id__": 53
+      "__id__": 50
     },
     "_id": "83opnQN/1AUYDky00YJeG0"
   },
@@ -1929,13 +1960,13 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 62
+      "__id__": 63
     },
     "planarShadows": {
-      "__id__": 63
+      "__id__": 64
     },
     "_skybox": {
-      "__id__": 64
+      "__id__": 65
     }
   },
   {

assets/resources/ui/PrepareUI.prefab

@@ -2466,7 +2466,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 140,
+      "x": 182.789,
       "y": -1,
       "z": 0
     },
@@ -2508,7 +2508,7 @@
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 1,
       "y": 0.5
     },
     "_id": ""
@@ -3698,7 +3698,7 @@
         "__id__": 124
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 128
@@ -3973,7 +3973,7 @@
         "__id__": 133
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 137
@@ -4321,7 +4321,7 @@
         "__id__": 184
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 197
@@ -6819,7 +6819,7 @@
         "__id__": 224
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 228

assets/resources/ui/ShopUI.prefab

@@ -23,23 +23,23 @@
         "__id__": 8
       },
       {
-        "__id__": 18
+        "__id__": 19
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 28
-      },
       {
         "__id__": 29
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -293,10 +293,13 @@
       },
       {
         "__id__": 15
+      },
+      {
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -575,6 +578,34 @@
     "handler": "BackButtonClick",
     "customEventData": ""
   },
+  {
+    "__type__": "cc.WidgetComponent",
+    "_name": "BackButton<WidgetComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_alignFlags": 9,
+    "_target": null,
+    "_left": 13.519000000000005,
+    "_right": 0,
+    "_top": 26.874000000000024,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -599,14 +630,11 @@
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 23
-      },
       {
         "__id__": 24
       },
@@ -615,10 +643,13 @@
       },
       {
         "__id__": 26
+      },
+      {
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -653,20 +684,20 @@
     "_name": "ListContent",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 21
       },
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -701,7 +732,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_priority": 0,
@@ -722,7 +753,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_resizeMode": 1,
@@ -765,7 +796,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_priority": 0,
@@ -786,7 +817,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "bounceDuration": 1,
@@ -798,7 +829,7 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 19
+      "__id__": 20
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": null,
@@ -809,7 +840,7 @@
     "_name": "List<WidgetComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_alignFlags": 45,
@@ -837,7 +868,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -931,10 +962,10 @@
       "__uuid__": "d9ffbd75-c8be-4aaa-aaef-3ccd42b04917"
     },
     "ListContext": {
-      "__id__": 21
+      "__id__": 22
     },
     "List": {
-      "__id__": 24
+      "__id__": 25
     },
     "_id": ""
   },

assets/scripts/engines/loadingView/LoadingView.ts

@@ -16,7 +16,7 @@ export class LoadingView extends Component {
     }
 
     start () {
-        this.label.string="";
+        // this.label.string="";
     }
     // update (dt) {}
 

assets/scripts/engines/scenes/SceneManager.ts

@@ -11,7 +11,8 @@ export class SceneManager{
     public Swicth(sceneName:string):void{
         this.sceneName=sceneName;
         LoadingView.single.Show();
-        console.log("切换到场景："+sceneName);
+        console.log("切换到："+sceneName);
+        LoadingView.single.UpdateLabel("切换到："+sceneName);
         director.preloadScene(sceneName,this.OnProgressHandler.bind(this),this.OnCompleteHandler.bind(this))
     }
 
@@ -22,6 +23,7 @@ export class SceneManager{
     private OnCompleteHandler(error: null | Error, sceneAsset?: SceneAsset):void{
         if(error!=null){
             console.error(this.sceneName+"加载错误："+error);
+            LoadingView.single.UpdateLabel(this.sceneName+"加载错误："+error);
         }
         director.loadScene(this.sceneName);
         LoadingView.single.Hide();

assets/scripts/engines/utils/SubPackageLoader.ts

@@ -0,0 +1,58 @@
+import { _decorator, Component, Node, sys } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('SubPackageLoader')
+export class SubPackageLoader {
+    
+    static load(packages:string[],progressCallBack:Function,completeCallBack:Function,errorCallback?:Function):void{
+        console.log("平台："+sys.browserType);
+        // switch (sys.browserType) {
+            // case sys.BROWSER_TYPE_WECHAT:
+                this.__loadWX(packages,progressCallBack,completeCallBack,errorCallback);
+        //         break;
+        
+        //     default:
+        //         break;
+        // }
+    }
+
+    /**
+     * 微信
+     * @param packages 
+     * @param progressCallBack 
+     * @param completeCallBack 
+     */
+    private static __loadWX(packages:string[],progressCallBack:Function,completeCallBack:Function,errorCallback?:Function):void{
+        console.log("wx subpackage load");
+        let wx:any=window["wx"];
+        let packageName:string;
+        let loadIndex:number=0;
+        let total:number=packages.length;
+        let loadTask:any;
+        for (let index = 0; index < packages.length; index++) {
+            packageName = packages[index];
+            loadTask=wx.loadSubpackage({
+                name:packageName,
+                success:(res)=>{
+                    loadIndex++;
+                    if(loadIndex>=total){
+                        if(completeCallBack){
+                            completeCallBack();
+                        }
+                    }
+                },
+                fail:(err)=>{
+                    console.error(err);
+                    if(errorCallback){
+                        errorCallback(packageName+"加载出错!");
+                    }
+                }
+            })
+            loadTask.onProgressUpdate(res=>{
+                if(progressCallBack){
+                    progressCallBack(loadIndex+res.progress);
+                }
+            })
+        }
+    }
+}

assets/scripts/engines/utils/SubPackageLoader.ts.meta

@@ -0,0 +1,15 @@
+{
+  "ver": "2.0.14",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "b3c58cda-32c1-448d-a793-68b456572123",
+  "files": [
+    ".js",
+    ".trans"
+  ],
+  "subMetas": {},
+  "userData": {
+    "importAsPlugin": false,
+    "moduleId": "project:///assets/scripts/engines/utils/SubPackageLoader.js"
+  }
+}

assets/scripts/games/models/GameModel.ts

@@ -162,6 +162,11 @@ export class GameModel extends DataModel{
         if(newWeaponConfig.level>synthesisMaxWeaponConfig.level){
             this.synthesisMaxWeaponId=newWeaponId;
         }
+        //如果比手上的好
+        if(this.__currentWeaponCell.weaponConfig&&newWeaponConfig.level>this.__currentWeaponCell.weaponConfig.level){
+            this.EquipWeapon(targetCellId);
+            return;
+        }
         this.DispatchEvent(DataModelEventType.PROPERTY_CHANGED,GamePropertys.WeaponCell);
     }
 

assets/scripts/games/scenes/PreloadingScene.ts

@@ -8,17 +8,11 @@ import GameConfigManager from '../models/GameConfigManager';
 import { WeaponCell } from '../models/weapons/WeaponCell';
 import { NoticeManager } from '../../engines/notices/NoticeManager';
 import { LiangLiangSDK } from '../../libs/liangliangSDK';
+import { SubPackageLoader } from '../../engines/utils/SubPackageLoader';
 const { ccclass, property } = _decorator;
 
 @ccclass('PreloadingScene')
 export class PreloadingScene extends Component {
-    /* class member could be defined like this */
-    // dummy = '';
-
-    /* use `property` decorator if your want the member to be serializable */
-    // @property
-    // serializableDummy = 0;
-
 
     onLoad(){
         console.log("进入Preloading场景");
@@ -30,25 +24,16 @@ export class PreloadingScene extends Component {
         if(window["wx"]){
             this.LoadSubPackage();
         }else{
-            this.initAds();
+            this.LoadConfigs();
         }
     }
 
     private initAds():void{
-        console.log("初始化 ADS");
-        if(sys.isBrowser){
-            console.log("平台：isBrowser");
-            GameModel.single.gameName="QiangShenZhanJi"
-            GameModel.single.userId="Guest";
-            this.LoadConfigs();
-        }else if(sys.isMobile){
-            console.log("平台：isMobile");
-            LiangLiangSDK.Init(()=>{
-                this.AdsComplete();
-            },()=>{
-               this.AdsComplete();
-            })
-        }
+        LiangLiangSDK.Init(()=>{
+            this.AdsComplete();
+        },()=>{
+            this.AdsComplete();
+        })
     }
 
     private AdsComplete():void{
@@ -56,23 +41,22 @@ export class PreloadingScene extends Component {
         GameModel.single.userId=LiangLiangSDK.userID;
         this.LoadConfigs();
     }
-
+    
     private LoadSubPackage():void{
         console.log("加载分包");
-        loader.downloader.loadSubpackage('d3d', (err: any) => {
-            if (err) {
-                return console.error("loadSubpackage Error:"+err);
-            }
-            loader.downloader.loadSubpackage('ui', (err: any) => {
-                if (err) {
-                    return console.error("loadSubpackage Error:"+err);
-                }
-                this.initAds();
-            });
-        });
+        LoadingView.single.UpdateLabel("加载分包");
+        SubPackageLoader.load(["ui","barriers","gunFire","hands","monsters","scenes","textures","weapons"],(progress:number)=>{
+            LoadingView.single.UpdateProgress(progress);
+        },()=>{
+            LoadingView.single.UpdateLabel("拉取平台数据");
+            this.initAds();
+        },(errMsg:string)=>{
+            LoadingView.single.UpdateLabel(errMsg);
+        })
     }
 
     LoadConfigs():void{
+        LoadingView.single.UpdateLabel("加载配置");
         loader.loadResDir("configs",JsonAsset,this.onConfigLoadProgress.bind(this),this.onConfigLoadComplete.bind(this));
     }
 
@@ -82,25 +66,25 @@ export class PreloadingScene extends Component {
 
     onConfigLoadComplete(error,asset):void{
         if(error!=null){
-            throw new Error("加载配置出错！");
+            LoadingView.single.UpdateLabel("加载配置出错!");
+            return;
         }
         GameConfigManager.Init(asset);
-
         this.initLocalData();
     }
 
     private initLocalData():void{
-        //清除本地数据
-        GameModel.single.ClearLocalData();
+        // //清除本地数据
+        // GameModel.single.ClearLocalData();
         GameModel.single.ReadByLocal();
         SceneManager.single.Swicth("PrepareScene");
     }
     
-    //假进度条
-    private time:number=0;
-    update (deltaTime: number) {
-        this.time+=deltaTime;
-        this.time=this.time%2;
-        LoadingView.single.UpdateProgress(this.time/3);
-    }
+    // //假进度条
+    // private time:number=0;
+    // update (deltaTime: number) {
+    //     this.time+=deltaTime;
+    //     this.time=this.time%2;
+    //     LoadingView.single.UpdateProgress(this.time/3);
+    // }
 }

assets/scripts/games/ui/fightings/monsters/MonsterBase.ts

@@ -126,6 +126,9 @@ export class MonsterBase extends Component {
      * 开始移动
      */
     Move():void{
+        if(this.state>0){
+            return;
+        }
         this.removeAllAnimationEvent();
         this.state=0;
     }
@@ -161,6 +164,7 @@ export class MonsterBase extends Component {
     }
 
     private AttackComplete():void{
+        this.state=0;
         this.Move();
     }
 
@@ -191,6 +195,7 @@ export class MonsterBase extends Component {
     }
 
     private DamageComplete():void{
+        this.state=0;
         this.Move();
     }
 

assets/scripts/games/ui/shops/ShopMediator.ts

@@ -26,6 +26,10 @@ export class ShopMediator extends GUIMediator {
     })
     List:ScrollViewComponent=null;
 
+    /**
+     * 需要包含在内的武器
+     */
+    private include:number[]=[];
 
     OnShow(data?:any):void{
         super.OnShow(data);
@@ -36,7 +40,7 @@ export class ShopMediator extends GUIMediator {
     OnHide():void{
         this.RemoveEvent();
     }
-
+    
     /**
      * 返回按钮点击
      */
@@ -54,6 +58,9 @@ export class ShopMediator extends GUIMediator {
     }
 
     private RefreshList(srollToZ:boolean):void{
+        //根据当前枪生成包含列表
+        this.buildInclude();
+
         let itemView:Node;
         let dataList:any[]=this.GetListData();
         if(dataList.length!=this.ListContext.node.children.length){
@@ -84,6 +91,27 @@ export class ShopMediator extends GUIMediator {
             this.List.scrollToTop(0.1);
         }
     }
+    private buildInclude():void{
+        this.include.length=0;
+        let currentWeaponConfig:any=GameConfigManager.GetWeaponConfig(GameModel.single.synthesisMaxWeaponId);
+        let weaponConfig:any;
+        //低级6个
+        for (let index = 1; index <=6; index++) {
+            weaponConfig=GameConfigManager.GetWeaponConfigByLevel(currentWeaponConfig.level-index);
+            if(weaponConfig!=null){
+                this.include.push(weaponConfig.id);
+            }
+        }
+        //当前
+        this.include.push(GameModel.single.synthesisMaxWeaponId);
+        //高级3个
+        for(let index=1;index<4;index++){
+            weaponConfig=GameConfigManager.GetWeaponConfigByLevel(currentWeaponConfig.level+index);
+            if(weaponConfig!=null){
+                this.include.push(weaponConfig.id);
+            }
+        }
+    }
 
     /**
      * 根据当前合成过的最大枪来计算列表数据
@@ -103,7 +131,12 @@ export class ShopMediator extends GUIMediator {
         let shopList:any[]=GameConfigManager.ShopList;
         shopList.sort((a,b)=> a.index-b.index);
         let itemData:any;
-        shopList.forEach(element => {
+
+        for (let index = 0; index < shopList.length; index++) {
+            const element = shopList[index];
+            if(this.include.indexOf(element.id)<0){
+                continue;
+            }
             weaponConfig=GameConfigManager.GetWeaponConfig(element.id);
             itemData={
                 id:element.id,
@@ -128,7 +161,7 @@ export class ShopMediator extends GUIMediator {
                 itemData.state=1;
             }
             result.push(itemData);
-        });
+        }
         return result;
     }