Skip to content

Commit

Permalink
[CN UPDATE] Client:2.2.41 Data:24-04-11-15-55-07-dc20eb
Browse files Browse the repository at this point in the history
  • Loading branch information
MuelsyseBot_v1 committed Apr 11, 2024
1 parent 6924708 commit d7e0999
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 27 deletions.
2 changes: 1 addition & 1 deletion zh_CN/gamedata/excel/climb_tower_table.json
Original file line number Diff line number Diff line change
Expand Up @@ -12869,7 +12869,7 @@
"missionBkg": "missionbkg_season_5",
"id": "tower_season5_7",
"sortId": 7,
"description": "在临时增调中累计招募15次术士干员",
"description": "在临时增调中累计招募15次术师干员",
"type": "TOWERSEASON",
"itemBgType": "COMMON",
"preMissionIds": null,
Expand Down
2 changes: 1 addition & 1 deletion zh_CN/gamedata/excel/data_version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Stream://torappu-data/v049/rel49.0
Change:59971 on 2024/04/09
Change:60124 on 2024/04/11
VersionControl:49.0.0
6 changes: 3 additions & 3 deletions zh_CN/gamedata/excel/medal_table.json
Original file line number Diff line number Diff line change
Expand Up @@ -10835,7 +10835,7 @@
"act33side_s01#f#;act33side_s02#f#;act33side_s03#f#;act33side_s04#f#",
"4"
],
"getMethod": "完成[我始终如一]中全部关卡(不包括剿灭)的突袭模式",
"getMethod": "完成[我始终如一]中全部关卡的突袭模式(不包含BB-MO-1)",
"description": "巴别塔最高级别的奖章,其中有一枚曾被授予您。\n岁月不曾在这枚闪亮的奖章上留下痕迹,也没有冲淡它所承载的期望。",
"advancedMedal": null,
"originMedal": null,
Expand Down Expand Up @@ -11466,7 +11466,7 @@
"act31side_s01#f#;act31side_s02#f#;act31side_s03#f#;act31side_s04#f#",
"4"
],
"getMethod": "完成[大江北岸]中全部关卡(不包括剿灭)的突袭模式",
"getMethod": "完成[大江北岸]中全部关卡的突袭模式(不包含HS-MO-1)",
"description": "您翻过神农遗稿复制品的末页,触到了司岁台的印戳。\n神农躬耕北疆的半生并不孤寂。她的友人长生于世,她的理想永驻世间。",
"advancedMedal": null,
"originMedal": null,
Expand Down Expand Up @@ -13035,7 +13035,7 @@
"act27side_s01#f#;act27side_s02#f#;act27side_s03#f#;act27side_s04#f#;act27side_s05#f#",
"5"
],
"getMethod": "完成[岩浆冲浪]内全部关卡(不包括剿灭)的突袭模式",
"getMethod": "完成[岩浆冲浪]中全部关卡的突袭模式(不包含SL-MO-1)",
"description": "您深入火山险境获取第一手考察数据并平安归来。\n这些珍贵资料将成为展陈在汐斯塔火山博物馆中的无价宝藏。",
"advancedMedal": null,
"originMedal": null,
Expand Down
2 changes: 1 addition & 1 deletion zh_CN/gamedata/excel/skill_table.json
Original file line number Diff line number Diff line change
Expand Up @@ -195110,7 +195110,7 @@
"spData": {
"spType": "INCREASE_WITH_TIME",
"levelUpCost": null,
"maxChargeTime": 2,
"maxChargeTime": 3,
"spCost": 8,
"initSp": 4,
"increment": 1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@
{
"actionType": "ACTIVATE_PREDEFINED",
"managedByScheduler": true,
"key": "char_235_jesica",
"key": "char_130_doberm",
"count": 1,
"preDelay": 7.0,
"interval": 1.0,
Expand All @@ -1525,13 +1525,18 @@
"isValid": false,
"extraMeta": null,
"actionId": null
},
}
]
},
{
"preDelay": 1.0,
"actions": [
{
"actionType": "ACTIVATE_PREDEFINED",
"managedByScheduler": true,
"key": "char_130_doberm",
"key": "char_235_jesica",
"count": 1,
"preDelay": 7.0,
"preDelay": 0.0,
"interval": 1.0,
"routeIndex": 5,
"blockFragment": false,
Expand All @@ -1548,13 +1553,18 @@
"isValid": false,
"extraMeta": null,
"actionId": null
},
}
]
},
{
"preDelay": 0.0,
"actions": [
{
"actionType": "STORY",
"managedByScheduler": true,
"key": "Activities/act33side/Training/training_act33side_01_c",
"count": 1,
"preDelay": 8.0,
"preDelay": 0.0,
"interval": 1.0,
"routeIndex": 6,
"blockFragment": false,
Expand All @@ -1571,13 +1581,18 @@
"isValid": false,
"extraMeta": null,
"actionId": null
},
}
]
},
{
"preDelay": 4.0,
"actions": [
{
"actionType": "STORY",
"managedByScheduler": true,
"key": "Activities/act33side/Training/training_act33side_01_d",
"count": 1,
"preDelay": 10.0,
"preDelay": 2.0,
"interval": 1.0,
"routeIndex": 7,
"blockFragment": false,
Expand All @@ -1600,7 +1615,7 @@
"managedByScheduler": true,
"key": "Activities/act33side/Training/training_act33side_01_e",
"count": 1,
"preDelay": 15.0,
"preDelay": 7.0,
"interval": 1.0,
"routeIndex": 8,
"blockFragment": false,
Expand Down Expand Up @@ -1686,13 +1701,18 @@
"isValid": false,
"extraMeta": null,
"actionId": null
},
}
]
},
{
"preDelay": 2.0,
"actions": [
{
"actionType": "ACTIVATE_PREDEFINED",
"managedByScheduler": true,
"key": "char_123_fang",
"count": 1,
"preDelay": 20.0,
"preDelay": 0.0,
"interval": 1.0,
"routeIndex": 12,
"blockFragment": false,
Expand All @@ -1709,13 +1729,18 @@
"isValid": false,
"extraMeta": null,
"actionId": null
},
}
]
},
{
"preDelay": 0.0,
"actions": [
{
"actionType": "STORY",
"managedByScheduler": true,
"key": "Activities/act33side/Training/training_act33side_01_f",
"count": 1,
"preDelay": 21.0,
"preDelay": 0.0,
"interval": 1.0,
"routeIndex": 13,
"blockFragment": false,
Expand Down
4 changes: 1 addition & 3 deletions zh_CN/gamedata/levels/enemydata/enemy_database.json
Original file line number Diff line number Diff line change
Expand Up @@ -186081,9 +186081,7 @@
},
"enemyTags": {
"m_defined": true,
"m_value": [
"sarkaz"
]
"m_value": []
},
"lifePointReduce": {
"m_defined": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[delay(time="1")]
[camerafocusto(offsetX="7", offsetY="3", time="2", scale="FAR")]
[avatarId="", isAvatarRight="FALSE"]检检测到未识别目标!警报即将启动——管理员权限介入,警报已取消。
[avatarId="", isAvatarRight="FALSE"]检测到未识别目标!警报即将启动——管理员权限介入,警报已取消。
[avatarId="", isAvatarRight="FALSE"]指挥系统已加载最优路线数据,战术配置已完成。
[avatarId="", isAvatarRight="FALSE"]安全窗口倒计时开始,请尽快采取行动......
[delay(time="1")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
[playMusic(intro="$path_intro", key="$path_loop", volume=0.6)]
[charslot(slot = "m", name = "avg_npc_1361_1#1$1",duration = 0.5)]
[Delay(time=0.8)]
[name="外勤战士"]这位先生,您还是把那个医疗箱放下吧,这些事交给我们就好。
[name="外勤战士"]您好,您还是把那个医疗箱放下吧,这些事交给我们就好。
[charslot(slot = "m", name = "avg_npc_048")]
[name="博士"]好......好吧......
[dialog]
Expand All @@ -59,7 +59,7 @@
[PlaySound(key="$d_avg_clothmovement")]
[charslot(slot = "m",posfrom = "0,-50", posto = "0,0",duration = 0.8)]
[Delay(time=1)]
[name="外勤战士"]康复以后记得加强锻炼,先生
[name="外勤战士"]康复以后记得加强锻炼。
[dialog]
[PlaySound(key="$d_gen_walk_n",volume=0.7)]
[charslot(slot = "m",posfrom = "0,0", posto = "200,0",duration = 1,afrom=1,ato=0)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[HEADER(is_tutorial=true, is_skippable=false)] 活动33side教学关1_b2
[HEADER(is_tutorial=true, is_skippable=true)] 活动33side教学关1_b2

[Battle.Pause]
[InputBlocker(blockInput=false)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[HEADER(is_tutorial=true, is_skippable=false)] 活动33side教学关1_c
[HEADER(is_tutorial=true, is_skippable=true)] 活动33side教学关1_c

[Battle.LockFunction(mask="SYSTEM_MENU")]
[Battle.Pause]
Expand Down

0 comments on commit d7e0999

Please sign in to comment.