Skip to content

Commit d764c52

Browse files
committed
新增:陶六一的记忆
1 parent 13853cf commit d764c52

25 files changed

Lines changed: 111848 additions & 6563 deletions

jyx2/Assets/3D/Animation/RPG Character Animation Pack/Armed/RPG-Character@Armed-Activate-Right.FBX.meta

Lines changed: 777 additions & 269 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jyx2/Assets/3D/Animation/RPG Character Animation Pack/Item/RPG-Character@Item-Attack-R4.FBX.meta

Lines changed: 735 additions & 248 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jyx2/Assets/3D/Animation/RPG Character Animation Pack/Unarmed/RPG-Character@Unarmed-Attack-L3.FBX.meta

Lines changed: 392 additions & 146 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
2022-09-03
2+
新增:陶六一的记忆
3+
14
2022-09-02
25
优化:莫桥山庄和将军府地编
84.7 KB
Loading
18 Bytes
Binary file not shown.

jyx2/Assets/Mods/SAMPLE/Lua/150.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ Talk(180, "最关键的是,真正的陶六一已经死了。");
1313
Talk(0, "陶六一,是你杀死的?");
1414
Talk(180, "哼,好奇害死猫,那小子看到了不该看的东西,已经被我推到野狼谷下喂狼去了。");
1515
Talk(100, "我头好疼,我好像想起什么了,这。。。。这是什么,这是陶六一的记忆吗?");
16-
17-
16+
jyx2_PlayTimelineSimple("[Timeline]15_鸽子楼", false);
17+
jyx2_Wait(4);
18+
jyx2_PlayTimelineSimple("[Timeline]15_野狼谷", false);
19+
jyx2_Wait(41);
1820
Talk(0, "我,我也是被你害死的!这所有的一切,都是你的阴谋!");
1921
Talk(180, "莫穿林!你果然是莫穿林!真是天助我也!");
2022
Talk(0, "徐谦!你到底是什么身份!");

jyx2/Assets/Mods/SAMPLE/Lua/180.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ if TryBattle(180) == true then goto label0 end;
33
Dead();
44
do return end;
55
::label0::
6-
Talk(0, "这家伙好凶!");
76
AddItem(180, 10);
87
AddItem(174, 100);
98
ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);

jyx2/Assets/Mods/SAMPLE/Lua/181.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ if TryBattle(181) == true then goto label0 end;
33
Dead();
44
do return end;
55
::label0::
6-
Talk(0, "这家伙好凶!");
76
AddItem(181, 10);
87
ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);
98
do return end;

jyx2/Assets/Mods/SAMPLE/Lua/7.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if ShowYesOrNoSelectPanel("是否挖掘坟墓?") == true then goto label0 end;
1111
DarkScence();
1212
jyx2_ReplaceSceneObject("", "NPC/莫穿林 (2)", "1");
1313
jyx2_ReplaceSceneObject("", "Dynamic/Grave/Tomb", "");
14+
jyx2_FixMapObject("挖坟移动", 1);
1415
jyx2_ReplaceSceneObject("", "Player/陶六一", "1");
1516
LightScence();
1617
Talk(0, "并没有什么线索,明明是自己埋的还挖开,我想我脑子坏掉了。");

0 commit comments

Comments
 (0)