Browse code Merge branch 'develop' of https://gitee.com/xlljc/DungeonShooting into develop # Conflicts: # DungeonShooting_Godot/scene/Hall.tscn develop
commit d809b6a9a038cbc8d5fdb11a9171734a8c49da78 2 parents 095c8c0 + 4a0ae0a 王晗智 authored on 20 Mar 2024

Showing 38 changed files

• DungeonShooting_Godot/excel/ActivePropBase.xlsx
• DungeonShooting_Godot/excel/ActivityBase.xlsx
• DungeonShooting_Godot/excel/WeaponBase.xlsx
• DungeonShooting_Godot/prefab/prop/activeComp/Prop5003_Area.tscn
• DungeonShooting_Godot/resource/config/ActivePropBase.json
• DungeonShooting_Godot/resource/config/ActivityBase.json
• DungeonShooting_Godot/resource/config/WeaponBase.json
• DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json
• DungeonShooting_Godot/resource/sprite/brush/Brush2.png
• DungeonShooting_Godot/resource/sprite/brush/Brush3.png
• DungeonShooting_Godot/resource/sprite/brush/Brush4.png
• DungeonShooting_Godot/resource/sprite/brush/Brush5.png
• DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5002.png
• DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5002.png.import
• DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5003.png
• DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5003.png.import
• DungeonShooting_Godot/src/config/ExcelConfig_ActivePropBase.cs
• DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
• DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
• DungeonShooting_Godot/src/game/activity/prop/ActiveProp.cs
• DungeonShooting_Godot/src/game/activity/prop/PropActivity.cs
• DungeonShooting_Godot/src/game/activity/role/Role.cs
• DungeonShooting_Godot/src/game/activity/role/RoleState.cs
• DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
• DungeonShooting_Godot/src/game/activity/weapon/bow/Bow.cs
• DungeonShooting_Godot/src/game/buff/BuffFragment.cs
• DungeonShooting_Godot/src/game/buff/ChargeFragment.cs
• DungeonShooting_Godot/src/game/buff/ChargeFragmentAttribute.cs
• DungeonShooting_Godot/src/game/buff/ConditionFragment.cs
• DungeonShooting_Godot/src/game/buff/EffectFragment.cs
• DungeonShooting_Godot/src/game/buff/PropFragment.cs
• DungeonShooting_Godot/src/game/buff/buff/Buff_GetGold.cs
• DungeonShooting_Godot/src/game/buff/charge/Cha_Hurt.cs
• DungeonShooting_Godot/src/game/buff/effect/Eff_AreaTrigger.cs
• DungeonShooting_Godot/src/game/buff/effect/Eff_PiggyBank.cs
• DungeonShooting_Godot/src/game/buffComp/active/Prop5003Area.cs
• DungeonShooting_Godot/src/game/manager/PropFragmentRegister.cs
• DungeonShooting_Godot/src/game/manager/ResourcePath.cs

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/prefab/prop/activeComp/Prop5003_Area.tscn 0 → 100644

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/brush/Brush2.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/brush/Brush3.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/brush/Brush4.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/brush/Brush5.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5002.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5002.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5003.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/prop/active/ActiveProp5003.png.import 0 → 100644

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/prop/ActiveProp.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/prop/PropActivity.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/Role.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/RoleState.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/bow/Bow.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/BuffFragment.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/ChargeFragment.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/ChargeFragmentAttribute.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/ConditionFragment.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/EffectFragment.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/PropFragment.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/buff/Buff_GetGold.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/charge/Cha_Hurt.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/effect/Eff_AreaTrigger.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/buff/effect/Eff_PiggyBank.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/buffComp/active/Prop5003Area.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/manager/PropFragmentRegister.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/manager/ResourcePath.cs

Show line notes below