Commit 012bd7ed2cc9eaa385214ccb770472631d654482
1 parent
99e58f8e
add: 素材副本加上体力字段，任务表/任务活动表名字修改整合
Showing
11 changed files
with
9 additions
and
8 deletions
Show diff stats
Datas/pro2d/HeroFragmentsCarbon.xlsx deleted
No preview for this file type
Datas/pro2d/task/QuestAchievementDatas.xlsx renamed to Datas/pro2d/quest/QuestAchievementDatas.xlsx
No preview for this file type
Datas/pro2d/task/QuestDatas.xlsx renamed to Datas/pro2d/quest/QuestDatas.xlsx
No preview for this file type
Datas/pro2d/task/QuestDescription.xlsx renamed to Datas/pro2d/quest/QuestDescription.xlsx
No preview for this file type
Datas/pro2d/task/QuestFavorability.xlsx renamed to Datas/pro2d/quest/QuestFavorability.xlsx
No preview for this file type
Datas/pro2d/task/QuestGlobal.xlsx renamed to Datas/pro2d/quest/QuestGlobal.xlsx
No preview for this file type
No preview for this file type
Datas/pro2d/task/QuestCircleCtl.xlsx renamed to Datas/pro2d/quest_carbon/QuestCircleCtl.xlsx
No preview for this file type
Datas/pro2d/task/QuestLimitCtl.xlsx renamed to Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx
No preview for this file type
No preview for this file type
Defines/pro2d.xml
| @@ -800,6 +800,7 @@ | @@ -800,6 +800,7 @@ | ||
| 800 | <var name="HeroFragmentsCarbonName" type="string"/> | 800 | <var name="HeroFragmentsCarbonName" type="string"/> |
| 801 | <var name="HeroFragmentsCarbonCost" type="int"/> | 801 | <var name="HeroFragmentsCarbonCost" type="int"/> |
| 802 | <var name="SceneID" type="int"/> | 802 | <var name="SceneID" type="int"/> |
| 803 | + <var name="CostSP" type="int"/> | ||
| 803 | <var name="Reward" type="string"/> | 804 | <var name="Reward" type="string"/> |
| 804 | </bean> | 805 | </bean> |
| 805 | 806 | ||
| @@ -1396,7 +1397,7 @@ | @@ -1396,7 +1397,7 @@ | ||
| 1396 | <table name="TbHeroGradeMemoryExp" value="HeroGradeMemoryExp" input="pro2d/HeroGradeMemoryExp.xls"/> | 1397 | <table name="TbHeroGradeMemoryExp" value="HeroGradeMemoryExp" input="pro2d/HeroGradeMemoryExp.xls"/> |
| 1397 | <table name="TbHeroGradeMemoryLevelUp" value="HeroGradeMemoryLevelUp" input="pro2d/HeroGradeMemoryLevelUp.xls"/> | 1398 | <table name="TbHeroGradeMemoryLevelUp" value="HeroGradeMemoryLevelUp" input="pro2d/HeroGradeMemoryLevelUp.xls"/> |
| 1398 | <table name="TbHeroToSkill" value="HeroToSkill" input="pro2d/HeroToSkill.xlsx"/> | 1399 | <table name="TbHeroToSkill" value="HeroToSkill" input="pro2d/HeroToSkill.xlsx"/> |
| 1399 | - <table name="TbHeroFragmentsCarbon" value="HeroFragmentsCarbon" input="pro2d/HeroFragmentsCarbon.xlsx"/> | 1400 | + <table name="TbHeroFragmentsCarbon" value="HeroFragmentsCarbon" input="pro2d/quest_carbon/HeroFragmentsCarbon.xlsx"/> |
| 1400 | <table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/> | 1401 | <table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/> |
| 1401 | <table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/> | 1402 | <table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/> |
| 1402 | <table name="TbHeroItemFragment" value="HeroItemFragment" index="ItemCardID,ItemFragmentID,HeroID" input="pro2d/HeroItemFragment.xlsx"/> | 1403 | <table name="TbHeroItemFragment" value="HeroItemFragment" index="ItemCardID,ItemFragmentID,HeroID" input="pro2d/HeroItemFragment.xlsx"/> |
| @@ -1420,12 +1421,12 @@ | @@ -1420,12 +1421,12 @@ | ||
| 1420 | <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/> | 1421 | <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/> |
| 1421 | <table name="TbPunchboard" value="Punchboard" input="pro2d/Punchboard.xlsx"/> | 1422 | <table name="TbPunchboard" value="Punchboard" input="pro2d/Punchboard.xlsx"/> |
| 1422 | <table name="TbPunchInfo" value="PunchInfo" input="pro2d/PunchInfo.xlsx"/> | 1423 | <table name="TbPunchInfo" value="PunchInfo" input="pro2d/PunchInfo.xlsx"/> |
| 1423 | - <table name="TbQuestDatas" value="QuestDatas" input="pro2d/task/QuestDatas.xlsx"/> | ||
| 1424 | - <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/> | ||
| 1425 | - <table name="TbQuestFavorability" value="QuestFavorability" input="pro2d/task/QuestFavorability.xlsx"/> | ||
| 1426 | - <table name="TbQuestGlobal" value="QuestGlobal" input="pro2d/task/QuestGlobal.xlsx"/> | ||
| 1427 | - <table name="TbQuestCircleCtl" value="QuestCircleCtl" input="pro2d/task/QuestCircleCtl.xlsx"/> | ||
| 1428 | - <table name="TbQuestLimitCtl" value="QuestLimitCtl" input="pro2d/task/QuestLimitCtl.xlsx"/> | 1424 | + <table name="TbQuestDatas" value="QuestDatas" input="pro2d/quest/QuestDatas.xlsx"/> |
| 1425 | + <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/quest/QuestAchievementDatas.xlsx"/> | ||
| 1426 | + <table name="TbQuestFavorability" value="QuestFavorability" input="pro2d/quest/QuestFavorability.xlsx"/> | ||
| 1427 | + <table name="TbQuestGlobal" value="QuestGlobal" input="pro2d/quest/QuestGlobal.xlsx"/> | ||
| 1428 | + <table name="TbQuestCircleCtl" value="QuestCircleCtl" input="pro2d/quest_carbon/QuestCircleCtl.xlsx"/> | ||
| 1429 | + <table name="TbQuestLimitCtl" value="QuestLimitCtl" input="pro2d/quest_carbon/QuestLimitCtl.xlsx"/> | ||
| 1429 | 1430 | ||
| 1430 | <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/> | 1431 | <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/> |
| 1431 | <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> | 1432 | <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> |
| @@ -1442,7 +1443,7 @@ | @@ -1442,7 +1443,7 @@ | ||
| 1442 | <table name="TbSmallDialoge" value="SmallDialoge" input="pro2d/SmallDialoge.xlsx"/> | 1443 | <table name="TbSmallDialoge" value="SmallDialoge" input="pro2d/SmallDialoge.xlsx"/> |
| 1443 | <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/> | 1444 | <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/> |
| 1444 | <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/> | 1445 | <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/> |
| 1445 | - <table name="TbSurvivalCarbon" value="SurvivalCarbon" input="pro2d/SurvivalCarbon.xlsx"/> | 1446 | + <table name="TbSurvivalCarbon" value="SurvivalCarbon" input="pro2d/quest_carbon/SurvivalCarbon.xlsx"/> |
| 1446 | 1447 | ||
| 1447 | <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/> | 1448 | <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/> |
| 1448 | 1449 |