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

# Conflicts:
#	assets/scripts/games/scenes/PrepareScene.ts

assets/d3d/gunFire/zhuodan.fbx.meta

@@ -80,12 +80,12 @@
         "events": []
       }
     },
-    "a55e7": {
+    "adacb": {
       "importer": "gltf-embeded-image",
-      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7",
+      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb",
       "displayName": "",
-      "id": "a55e7",
-      "name": "5555.png.image",
+      "id": "adacb",
+      "name": "file2.image",
       "ver": "1.0.2",
       "imported": true,
       "files": [
@@ -118,7 +118,7 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
+        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
       }
     },
     "826f3": {
@@ -141,8 +141,8 @@
   "userData": {
     "imageMetas": [
       {
-        "name": "5555.png",
-        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
+        "name": "file2",
+        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
       }
     ],
     "animationImportSettings": [

assets/resources/configs/Monsters.json

@@ -7,7 +7,6 @@
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1.2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -29,11 +28,10 @@
         "id": 20101002,
         "prefab": "d3d/monsters/guai_0101",
         "moveSpeed": 1.2,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1.2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -59,7 +57,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -81,11 +78,10 @@
         "id": 20201001,
         "prefab": "d3d/monsters/guai_0201",
         "moveSpeed": 1,
-        "moveAnimation": "Walk2",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -107,11 +103,10 @@
         "id": 20201002,
         "prefab": "d3d/monsters/guai_0201",
         "moveSpeed": 1,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -137,7 +132,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -163,7 +157,6 @@
         "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -185,11 +178,10 @@
         "id": 20301002,
         "prefab": "d3d/monsters/guai_0301",
         "moveSpeed": 2,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -215,7 +207,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -237,12 +228,11 @@
         "id": 20401001,
         "prefab": "d3d/monsters/guai_0401",
         "moveSpeed": 4,
-        "moveAnimation": "Walk2",
+        "moveAnimation": "Run",
         "moveAnimationSpeed": 4,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 4,
-        "SuperArmor": 0,
-        "damageParticle": "d3d/Particle/zhuodan2",
+        "damageParticle": "d3d/Particle/Particle_meijin",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -267,8 +257,7 @@
         "moveAnimationSpeed": 4,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 4,
-        "SuperArmor": 0,
-        "damageParticle": "d3d/Particle/zhuodan2",
+        "damageParticle": "d4d/Particle/Particle_meijin",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -293,8 +282,7 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
-        "damageParticle": "d3d/Particle/zhuodan2",
+        "damageParticle": "d5d/Particle/Particle_meijin",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -319,7 +307,6 @@
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1.2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -341,11 +328,10 @@
         "id": 20501002,
         "prefab": "d3d/monsters/guai_0501",
         "moveSpeed": 1.2,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1.2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -371,7 +357,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -393,11 +378,10 @@
         "id": 20601001,
         "prefab": "d3d/monsters/guai_0601",
         "moveSpeed": 2,
-        "moveAnimation": "Walk2",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -419,11 +403,10 @@
         "id": 20601002,
         "prefab": "d3d/monsters/guai_0601",
         "moveSpeed": 2,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -449,7 +432,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -471,11 +453,10 @@
         "id": 20901001,
         "prefab": "d3d/monsters/guai_0901",
         "moveSpeed": 0.8,
-        "moveAnimation": "Walk",
+        "moveAnimation": "Walk2",
         "moveAnimationSpeed": 0.8,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.8,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -497,11 +478,10 @@
         "id": 20901002,
         "prefab": "d3d/monsters/guai_0901",
         "moveSpeed": 0.8,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk2",
         "moveAnimationSpeed": 0.8,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.8,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -527,7 +507,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -553,7 +532,6 @@
         "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -575,11 +553,10 @@
         "id": 21001002,
         "prefab": "d3d/monsters/guai_1001",
         "moveSpeed": 2,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk2",
         "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -605,7 +582,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -631,7 +607,6 @@
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1.2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -653,11 +628,10 @@
         "id": 21101002,
         "prefab": "d3d/monsters/guai_1101",
         "moveSpeed": 1.2,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1.2,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -683,7 +657,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -705,12 +678,11 @@
         "id": 21201001,
         "prefab": "d3d/monsters/guai_1201",
         "moveSpeed": 3,
-        "moveAnimation": "Walk2",
+        "moveAnimation": "Run",
         "moveAnimationSpeed": 3,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 3,
-        "SuperArmor": 0,
-        "damageParticle": "d3d/Particle/zhuodan2",
+        "damageParticle": "d3d/Particle/Particle_lvyan",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -735,8 +707,7 @@
         "moveAnimationSpeed": 3,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 3,
-        "SuperArmor": 0,
-        "damageParticle": "d3d/Particle/zhuodan2",
+        "damageParticle": "d4d/Particle/Particle_lvyan",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -761,8 +732,7 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
-        "damageParticle": "d3d/Particle/zhuodan2",
+        "damageParticle": "d5d/Particle/Particle_lvyan",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -787,7 +757,6 @@
         "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -809,11 +778,10 @@
         "id": 21401002,
         "prefab": "d3d/monsters/guai_1401",
         "moveSpeed": 1,
-        "moveAnimation": "Run",
+        "moveAnimation": "Walk",
         "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
@@ -839,7 +807,6 @@
         "moveAnimationSpeed": 0.6,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 0.6,
-        "SuperArmor": 0,
         "damageParticle": "d3d/Particle/zhuodan2",
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,

assets/resources/ui/GameOverUI.prefab

@@ -315,7 +315,7 @@
         "__id__": 56
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 67
@@ -1809,7 +1809,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -562,
+      "y": -456.004,
       "z": 0
     },
     "_lrot": {
@@ -2201,7 +2201,7 @@
         "__id__": 102
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 113
@@ -3235,7 +3235,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -562,
+      "y": -381.031,
       "z": 0
     },
     "_lrot": {

assets/scripts/games/models/GameConfigManager.ts

@@ -353,6 +353,7 @@ export default class GameConfigManager
                     monsterConfig.anger=element.anger;
                     monsterConfig.integral=element.integral;
                     monsterConfig.fireTip=element.fireTip;
+                    monsterConfig.SuperArmor=element.SuperArmor;
                     if(element.startPosType==1){
                         let r:number=Math.random()*9;
                         if(r<3){

assets/scripts/games/scenes/PrepareScene.ts

@@ -49,12 +49,13 @@ export class PrepareScene extends Component {
         if (weChat instanceof WeChatPlatform) {
             weChat.branchAnalytics(branchIdType.EnterHall)
         }
-
-        // if(LiangLiangSDK.CanWuChu() == true){
-        //     GUIManager.single.Show(UIConst.ADVERTISING_UI)
-        // }else{
-        //     PlatformManager.showBanner();
-        // }
+        
+        if(LiangLiangSDK.CanWuChu() == true){
+            // GUIManager.single.Show(UIConst.ADVERTISING_UI)
+            PlatformManager.showBanner();
+        }else{
+            PlatformManager.showBanner();
+        }
 
     }
 

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

@@ -222,7 +222,7 @@ export class MonsterBase extends Component {
                 return;
             }
             //霸体
-            if(this.monsterConfig.SuperArmor>0){
+            if(this.config.SuperArmor>0){
                 this.state=0;
             }else{
                 this.animation.on(AnimationComponent.EventType.FINISHED,this.DamageComplete,this,true);

assets/scripts/games/ui/freeUpgrade/FreeUpgradeMediator.ts

@@ -178,6 +178,16 @@ export class FreeUpgradeMediator extends GUIMediator {
             GameModel.single.currentWeaponCellId=cell.cellId;
             GameModel.single.DispatchEvent(DataModelEventType.PROPERTY_CHANGED,GamePropertys.WeaponCell);
         }
+        let synthesisMaxWeaponConfig:any=GameConfigManager.GetWeaponConfig(GameModel.single.synthesisMaxWeaponId);
+        let newWeaponConfig:any=GameConfigManager.GetWeaponConfig(cell.weaponId);
+        //新记录
+        if (newWeaponConfig.level > synthesisMaxWeaponConfig.level) {
+            GameModel.single.synthesisMaxWeaponId = cell.weaponId;
+            if(GameModel.single.currentWeaponCell.weaponConfig && newWeaponConfig.level > GameModel.single.currentWeaponCell.weaponConfig.level){//如果比手上的好
+                GameModel.single.EquipWeapon(cell);
+                return;
+            }
+        }
         return true;
     }
 

assets/scripts/libs/liangliangSDK.ts

@@ -299,23 +299,23 @@ export  class LiangLiangSDK
 
     static CanWuChu():boolean
     {
-        // if(!LiangLiangSDK._config)
-        // {
-        //     return false;
-        // }
-        // if(currentSDK != LiangLiangSDK._config.version)
-        // {
-        //     return false;
-        // }
-        // if(!LiangLiangSDK._config.mistakeSwitch)
-        // {
-        //     return false;
-        // }
-        // //上海forbidSwitch   为true
-        // if(LiangLiangSDK._config.forbidSwitch)
-        // {
-        //     return false;
-        // }
+        if(!LiangLiangSDK._config)
+        {
+            return false;
+        }
+        if(currentSDK != LiangLiangSDK._config.version)
+        {
+            return false;
+        }
+        if(!LiangLiangSDK._config.mistakeSwitch)
+        {
+            return false;
+        }
+        //上海forbidSwitch   为true
+        if(LiangLiangSDK._config.forbidSwitch)
+        {
+            return false;
+        }
         return true;
     }
 }