完成子弹反弹配置，解决buff不会影响爆炸属性等问题

Fork: 0

root / DungeonShooting

Browse code 完成子弹反弹配置，解决buff不会影响爆炸属性等问题 develop
1 parent e653c15 commit 0d414ae637a68afe59bc38f315efb0d033cd089c 小李xl authored on 7 Nov 2023

Patch

Unified Split

Showing 25 changed files

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/Sound.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx
Not supported

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          DungeonShooting_Godot/resource/config/ActivityBase.json
     "Name": "",
    "Intro": "",
    "Details": "",
    "IsStatic": false,
    "__Material": "",
    "__Material": "0003",
    "Prefab": "res://prefab/bullet/normal/Bullet0001.tscn",
    "Icon": "",
    "ShowInMapEditor": false
  },
    "Name": "",
    "Intro": "",
    "Details": "",
    "IsStatic": false,
    "__Material": "",
    "__Material": "0003",
    "Prefab": "res://prefab/bullet/normal/Bullet0002.tscn",
    "Icon": "",
    "ShowInMapEditor": false
  },
    "Name": "",
    "Intro": "",
    "Details": "",
    "IsStatic": false,
    "__Material": "",
    "__Material": "0003",
    "Prefab": "res://prefab/bullet/normal/Bullet0003.tscn",
    "Icon": "",
    "ShowInMapEditor": false
  },
     "Name": "",
     "Intro": "",
     "Details": "",
     "IsStatic": false,
+    "__Material": "",
+    "__Material": "0003",
     "Prefab": "res://prefab/bullet/normal/Bullet0001.tscn",
     "Icon": "",
     "ShowInMapEditor": false
   },
     "Name": "",
     "Intro": "",
     "Details": "",
     "IsStatic": false,
+    "__Material": "",
+    "__Material": "0003",
     "Prefab": "res://prefab/bullet/normal/Bullet0002.tscn",
     "Icon": "",
     "ShowInMapEditor": false
   },
     "Name": "",
     "Intro": "",
     "Details": "",
     "IsStatic": false,
+    "__Material": "",
+    "__Material": "0003",
     "Prefab": "res://prefab/bullet/normal/Bullet0003.tscn",
     "Icon": "",
     "ShowInMapEditor": false
   },

                Ignore Space
               Show notes
              View
            
          
          11 ■■■■■
          DungeonShooting_Godot/resource/config/ActivityMaterial.json
     "BounceStrength": 0.7,
    "FallBounceStrength": 0.7,
    "FallBounceSpeed": 0.85,
    "FallBounceRotation": 0.85
  },
  {
    "Id": "0003",
    "Remark": "\u5B50\u5F39,\u53CD\u5F39\u6D88\u8017\u4F4E",
    "Friction": 140,
    "RotationFriction": 140,
    "Bounce": true,
    "BounceStrength": 1,
    "FallBounceStrength": 0.5,
    "FallBounceSpeed": 0.75,
    "FallBounceRotation": 0.5
  }
]
     "BounceStrength": 0.7,
     "FallBounceStrength": 0.7,
     "FallBounceSpeed": 0.85,
     "FallBounceRotation": 0.85
+  },
+  {
+    "Id": "0003",
+    "Remark": "\u5B50\u5F39,\u53CD\u5F39\u6D88\u8017\u4F4E",
+    "Friction": 140,
+    "RotationFriction": 140,
+    "Bounce": true,
+    "BounceStrength": 1,
+    "FallBounceStrength": 0.5,
+    "FallBounceSpeed": 0.75,
+    "FallBounceRotation": 0.5
   }
 ]

Ignore Space Show notes View DungeonShooting_Godot/resource/config/BulletBase.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0002/Enemy0002.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0002/Enemy0002.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/role/Enemy0001.tres 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/role/Enemy0002.tres 0 → 100644

Show notes View DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/src/config/ExcelConfig_BulletBase.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/activity/components/MoveController.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/bullet/explode/Explode.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/bullet/laser/Laser.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/bullet/normal/BoomBullet.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/weapon/Weapon_Bullet.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/data/BulletData.cs

Show line notes below