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

assets/d3d/gunFire/GunFire.fbx.meta

@@ -21,29 +21,12 @@
         "gltfIndex": 0
       }
     },
-    "b3672": {
-      "importer": "gltf-mesh",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@b3672",
-      "displayName": "",
-      "id": "b3672",
-      "name": "FireSocket.mesh",
-      "ver": "1.1.0",
-      "imported": true,
-      "files": [
-        ".json",
-        ".bin"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0
-      }
-    },
-    "0fc10": {
+    "8b989": {
       "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@0fc10",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@8b989",
       "displayName": "",
-      "id": "0fc10",
-      "name": "GunFire.animation",
+      "id": "8b989",
+      "name": "GunFire3.animation",
       "ver": "1.0.14",
       "imported": true,
       "files": [
@@ -56,18 +39,18 @@
         "wrapMode": 1,
         "sample": 30,
         "span": {
-          "from": 0,
-          "to": 0.3333333333333333
+          "from": 0.8333333333333334,
+          "to": 1.5333333333333334
         },
         "events": []
       }
     },
-    "d9246": {
+    "ba033": {
       "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@d9246",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@ba033",
       "displayName": "",
-      "id": "d9246",
-      "name": "RifleFire.animation",
+      "id": "ba033",
+      "name": "GunFire4.animation",
       "ver": "1.0.14",
       "imported": true,
       "files": [
@@ -80,18 +63,35 @@
         "wrapMode": 1,
         "sample": 30,
         "span": {
-          "from": 0.3333333333333333,
-          "to": 0.4666666666666667
+          "from": 1.5333333333333334,
+          "to": 2.125
         },
         "events": []
       }
     },
-    "251e6": {
+    "b3672": {
+      "importer": "gltf-mesh",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@b3672",
+      "displayName": "",
+      "id": "b3672",
+      "name": "FireSocket.mesh",
+      "ver": "1.1.0",
+      "imported": true,
+      "files": [
+        ".json",
+        ".bin"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0
+      }
+    },
+    "0fc10": {
       "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@251e6",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@0fc10",
       "displayName": "",
-      "id": "251e6",
-      "name": "GunFire2.animation",
+      "id": "0fc10",
+      "name": "GunFire.animation",
       "ver": "1.0.14",
       "imported": true,
       "files": [
@@ -101,21 +101,21 @@
       "subMetas": {},
       "userData": {
         "gltfIndex": 0,
-        "wrapMode": 2,
+        "wrapMode": 1,
         "sample": 30,
         "span": {
-          "from": 0.5,
-          "to": 2.125
+          "from": 0,
+          "to": 0.3333333333333333
         },
         "events": []
       }
     },
-    "8b989": {
+    "d9246": {
       "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@8b989",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@d9246",
       "displayName": "",
-      "id": "8b989",
-      "name": "GunFire3.animation",
+      "id": "d9246",
+      "name": "RifleFire.animation",
       "ver": "1.0.14",
       "imported": true,
       "files": [
@@ -128,18 +128,18 @@
         "wrapMode": 1,
         "sample": 30,
         "span": {
-          "from": 0.8333333333333334,
-          "to": 1.5333333333333334
+          "from": 0.3333333333333333,
+          "to": 0.4666666666666667
         },
         "events": []
       }
     },
-    "ba033": {
+    "251e6": {
       "importer": "gltf-animation",
-      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@ba033",
+      "uuid": "c08efdb9-e201-4049-a1f1-0aed983f4f74@251e6",
       "displayName": "",
-      "id": "ba033",
-      "name": "GunFire4.animation",
+      "id": "251e6",
+      "name": "GunFire2.animation",
       "ver": "1.0.14",
       "imported": true,
       "files": [
@@ -149,10 +149,10 @@
       "subMetas": {},
       "userData": {
         "gltfIndex": 0,
-        "wrapMode": 1,
+        "wrapMode": 2,
         "sample": 30,
         "span": {
-          "from": 1.5333333333333334,
+          "from": 0.5,
           "to": 2.125
         },
         "events": []

assets/d3d/hands/Hand.fbx.meta

@@ -5,6 +5,54 @@
   "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6",
   "files": [],
   "subMetas": {
+    "67bb3": {
+      "importer": "gltf-animation",
+      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@67bb3",
+      "displayName": "",
+      "id": "67bb3",
+      "name": "SniperGunFire.animation",
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 1,
+        "sample": 30,
+        "span": {
+          "from": 4.066666666666666,
+          "to": 4.666666666666667
+        },
+        "events": []
+      }
+    },
+    "8c0dc": {
+      "importer": "gltf-animation",
+      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc",
+      "displayName": "",
+      "id": "8c0dc",
+      "name": "GatlingFire.animation",
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".bin",
+        ".json"
+      ],
+      "subMetas": {},
+      "userData": {
+        "gltfIndex": 0,
+        "wrapMode": 1,
+        "sample": 30,
+        "span": {
+          "from": 4.666666666666667,
+          "to": 4.833333492279053
+        },
+        "events": []
+      }
+    },
     "01a55": {
       "importer": "gltf-mesh",
       "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@01a55",
@@ -176,54 +224,6 @@
         "events": []
       }
     },
-    "67bb3": {
-      "importer": "gltf-animation",
-      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@67bb3",
-      "displayName": "",
-      "id": "67bb3",
-      "name": "SniperGunFire.animation",
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".bin",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0,
-        "wrapMode": 1,
-        "sample": 30,
-        "span": {
-          "from": 4.066666666666666,
-          "to": 4.666666666666667
-        },
-        "events": []
-      }
-    },
-    "8c0dc": {
-      "importer": "gltf-animation",
-      "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc",
-      "displayName": "",
-      "id": "8c0dc",
-      "name": "GatlingFire.animation",
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".bin",
-        ".json"
-      ],
-      "subMetas": {},
-      "userData": {
-        "gltfIndex": 0,
-        "wrapMode": 1,
-        "sample": 30,
-        "span": {
-          "from": 4.666666666666667,
-          "to": 4.833333492279053
-        },
-        "events": []
-      }
-    },
     "43c71": {
       "importer": "gltf-embeded-image",
       "uuid": "57122fad-a4bb-4503-99b7-f7738db893f6@43c71",

assets/resources/ui/PrepareUI.prefab

@@ -8311,7 +8311,7 @@
       "__id__": 267
     },
     "_enabled": true,
-    "playOnLoad": false,
+    "playOnLoad": true,
     "_clips": [
       {
         "__uuid__": "06ce7b63-73bf-43be-b5b9-3fbb885bb2e0"
@@ -8394,6 +8394,9 @@
       "__id__": 1
     },
     "_enabled": true,
+    "HandTip": {
+      "__id__": 267
+    },
     "bufferNode": {
       "__id__": 123
     },

assets/scripts/games/models/GameModel.ts

@@ -58,7 +58,7 @@ export class GameModel extends DataModel{
         for (let index = 0; index < 12; index++) {
             weaponCell=new WeaponCell();
             weaponCell.cellId=index;
-            weaponCell.weaponId=index==0?10101:-1;
+            weaponCell.weaponId=index<2?10101:-1;
             weaponCell.lastOutputTime=0;
             this.__weaponCells.push(weaponCell);
         }

assets/scripts/games/ui/gameovers/GameOverMediator.ts

@@ -51,7 +51,7 @@ export class GameOverMediator extends GUIMediator {
 
     private isWin: boolean;
     private award: number;
-
+    private diamond:number;
     onLoad() {
         // PlatformManager.showBanner()
     }
@@ -72,8 +72,10 @@ export class GameOverMediator extends GUIMediator {
             this.WinAwardLabel.string ="X"+StringUtils.numberUtilsEn(this.award,0);
             //钻石奖励
             if(levelConfig.diamondRewards>0){
+                this.diamond=levelConfig.diamondRewards;
                 this.DiamondAwardLabel.string="X"+StringUtils.numberUtilsEn(levelConfig.diamondRewards,0);
             }else{
+                this.diamond=0;
                 this.DiamondAwardLabel.string="";
             }
             let weChat = PlatformManager.impl as WeChatPlatform;
@@ -183,6 +185,7 @@ export class GameOverMediator extends GUIMediator {
     private AddAward(value: number = 1): void {
         if (this.isWin) {
             GameModel.single.gold += this.award * value;
+            GameModel.single.diamond+=this.diamond*value;
         }
     }
 

assets/scripts/games/ui/prepares/PrepareMediator.ts

@@ -21,6 +21,12 @@ const { ccclass, property } = _decorator;
 
 @ccclass('PrepareMediator')
 export class PrepareMediator extends GUIMediator {
+
+    @property({
+        type: Node
+    })
+    HandTip: Node = null;
+
     @property({
         type: Node
     })
@@ -142,6 +148,10 @@ export class PrepareMediator extends GUIMediator {
 
     private weaponCellListView: WeaponCellListView;
 
+    private isNew:boolean=true;
+    private get isNewPlayer():boolean{
+        return this.isNew&&GameModel.single.isNewPlayer;
+    }
 
     onLoad(): void {
         this.weaponCellListView = new WeaponCellListView(this);
@@ -161,6 +171,11 @@ export class PrepareMediator extends GUIMediator {
 
         SoundManager.single.PlayMusic("sounds/main");
         PlatformManager.showBanner();
+        if(this.isNewPlayer){
+            this.HandTip.active=true;
+        }else{
+            this.HandTip.active=false;
+        }
     }
 
     /**
@@ -262,6 +277,10 @@ export class PrepareMediator extends GUIMediator {
             case GamePropertys.synthesisMaxWeaponId:
                 this.CallNextFrame(this.RefreshQuickBuy.bind(this));
                 break;
+            case GamePropertys.WeaponCell:
+                this.HandTip.active=false;
+                this.isNew=false;
+            break;
         }
     }