Skip to content

Commit d270d05

Browse files
panxucpanxuc
authored
Merge pull request #133 from open531/dev
1.0.1
2 parents 8bad22f + 0b9a2f9 commit d270d05

File tree

6 files changed

+18
-39
lines changed

6 files changed

+18
-39
lines changed

‎Assets/Localizations/dialogue.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ E_PYTHON,蟒蛇,蟒蛇,Python,Python
1212
E_SHANLOONG,香龙,香龍,Shanloong,シャン竜
1313
E_SCHRODINGERCAT,薛定谔猫,薛定謝貓,Schrödinger cat,シュレディンガーの猫
1414
E_XIQIN,鱼骨守护者,魚骨守護者,Fishbone guardian,魚骨の守護者
15+
P_CODER,编码术士,編碼術士,Code warlock,コードウォーロック
16+
P_HARDWARE,硬件战士,硬件戰士,Hardware warrior,ハードウェア戦士
17+
P_SIGNAL,信号法师,信號法師,Signal mage,シグナルメイジ
1518
D_1_1,在那个阳光灿烂的下午，整个实验室沐浴在柔和的阳光中，空气中弥漫着轻微的电子元件的香气。你站在实验台前，手中的「万花尺」实验装置运作得如此完美，仿佛是一台精密的机械，每一次波形的生成都显得轻而易举。你自信满满地高举双手，心中充满了对即将到来的赞誉的期待。,在那個陽光燦爛的下午，整個實驗室沐浴在柔和的陽光中，空氣中瀰漫著輕微的電子元件的香氣。你站在實驗台前，手中的「萬花尺」實驗裝置運作得如此完美，仿佛是一台精密的機械，每一次波形的生成都顯得輕而易舉。你自信滿滿地高舉雙手，心中充滿了對即將到來的讚譽的期待。,"On that sunny afternoon, the entire laboratory was bathed in soft sunlight, and the air was filled with the faint aroma of electronic components. You stood in front of the experimental platform, and the ""Flower Ruler"" experimental device in your hand worked so perfectly that it seemed like a precision machine, and every waveform generation seemed effortless. You raised your hands confidently, full of expectation for the praise that was about to come.",その晴れた午後、実験室全体が柔らかい日差しに包まれ、空気中には電子部品のかすかな香りが漂っていた。あなたは実験台の前に立ち、手に持った「万花尺」実験装置が完璧に動作しているように思え、まるで精密機械のようで、毎回の波形生成が軽々しく見えた。あなたは自信を持って両手を高く掲げ、今にも訪れる賞賛に対する期待に満ちていた。
1619
D_1_2,助教步履轻快地走来，他的眼睛紧盯着你的实验结果，眼神中透露出敬佩。他仔细地比对波形图，每一个细节都与预期完美吻合，没有丝毫的偏差。他赞扬你的精确操作，你的心中涌起一股自豪感。随着助教的一笔签名，你的优异成绩就将铭刻在成绩册上，A+ 在向你招手。,助教步履輕快地走來，他的眼睛緊盯著你的實驗結果，眼神中透露出敬佩。他仔細地比對波形圖，每一個細節都與預期完美吻合，沒有絲毫的偏差。他讚揚你的精確操作，你的心中湧起一股自豪感。隨著助教的一筆簽名，你的優異成績就將銘刻在成績冊上，A+ 在向你招手。,"The teaching assistant walked briskly, his eyes fixed on your experimental results, his eyes showing admiration. He carefully compared the waveform, and every detail matched perfectly with the expected results, without any deviation. He praised your precise operation, and you felt a sense of pride. With a stroke of the teaching assistant's pen, your excellent results will be engraved in the grade book, and an A+ is beckoning to you.",助教は軽快な足取りで歩いてきた。彼の目はあなたの実験結果に注がれ、敬意を示していた。彼は波形を注意深く比較し、すべての詳細が予想通りに完璧に一致し、少しも逸脱がなかった。彼はあなたの正確な操作を称賛し、あなたは誇りを感じた。助教のペンの一筆で、あなたの優れた成績が成績簿に刻まれ、A+ があなたを招いている。
1720
D_2_1,正当你兴奋地准备在签名册上留下你的大名时，一声巨响切割了平静的空气，震耳欲聋。你转头一看，只见一团烟雾从一名同学的实验台上升起，电容器在电压的逼迫下爆炸了。冷风突然袭来，一种不详的预感笼罩了你的心头。你感到意识正在迅速地流失，周围的世界开始旋转，最终，一片黑暗将你吞噬。,正當你興奮地準備在簽名冊上留下你的大名時，一聲巨響切割了平靜的空氣，震耳欲聾。你轉頭一看，只見一團煙霧從一名同學的實驗台上升起，電容器在電壓的逼迫下爆炸了。冷風突然襲來，一種不詳的預感籠罩了你的心頭。你感到意識正在迅速地流失，周圍的世界開始旋轉，最終，一片黑暗將你吞噬。,"Just as you were excitedly preparing to leave your name in the grade book, a loud noise cut through the calm air, deafening. You turned around and saw a cloud of smoke rising from a classmate's experimental platform, and the capacitor exploded under the pressure of the voltage. A cold wind suddenly struck, and an ominous premonition shrouded your heart. You felt your consciousness rapidly slipping away, the world around you began to spin, and finally, darkness swallowed you up.",あなたが興奮して成績簿に名前を残そうとしていると、大きな音が静かな空気を切り裂き、耳をつんざくようだった。振り返ると、同級生の実験台から煙が立ち上り、コンデンサが電圧の圧力で爆発した。突然冷たい風が吹き、不吉な予感があなたの心を覆いました。あなたは意識が急速に失われているのを感じ、周囲の世界が回り始め、最終的には暗闇に飲み込まれました。

‎Scenes/Entities/BattleEnemies/binary_tree.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
[gd_scene load_steps=9 format=3 uid="uid://8rvgctj32ph7"]
1+
[gd_scene load_steps=9 format=3 uid="uid://dhb0ir7pmtwrh"]
22

33
[ext_resource type="PackedScene" uid="uid://die583u8tgrrl" path="res://Scenes/Entities/BattleEnemies/battle_enemy.tscn" id="1_la4l8"]
44
[ext_resource type="Script" path="res://Scripts/Entities/BattleEnemies/BinaryTree.cs" id="2_2mywo"]
5-
[ext_resource type="Texture2D" uid="uid://vlfjbm04l8tb" path="res://Assets/Textures/binary_tree_idle.png" id="3_7boio"]
5+
[ext_resource type="Texture2D" uid="uid://c13uc50xnbyv2" path="res://Assets/Textures/binary_tree_idle.png" id="3_7boio"]
66

77
[sub_resource type="AtlasTexture" id="AtlasTexture_gak30"]
88
atlas = ExtResource("3_7boio")

‎Scenes/UI/card_viewer.tscn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ script = ExtResource("1_ioauv")
99

1010
[node name="ScrollContainer" type="ScrollContainer" parent="."]
1111
unique_name_in_owner = true
12+
clip_contents = false
1213
offset_left = 4.0
1314
offset_top = 4.0
1415
offset_right = 496.0

‎Scripts/Data/SaveData.cs

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ public partial class SaveData : Node
1818
EnergyMax = 4,
1919
Energy = 4,
2020
Agility = 10,
21-
AttackCardNum = 0,
21+
AttackCardNum = 3,
2222
BashCardNum = 0,
2323
DoubleBeatCardNum = 0,
24-
DefendCardNum = 0,
24+
DefendCardNum = 3,
2525
ConsolidateCardNum = 0,
2626
EcsCardNum = 0,
2727
FuryCardNum = 0,
@@ -39,12 +39,6 @@ public partial class SaveData : Node
3939
CardData.CAStrike,
4040
CardData.CAStrike,
4141
CardData.CAStrike,
42-
CardData.CAStrike,
43-
CardData.CAStrike,
44-
CardData.CAStrike,
45-
CardData.CDDefend,
46-
CardData.CDDefend,
47-
CardData.CDDefend,
4842
CardData.CDDefend,
4943
CardData.CDDefend,
5044
CardData.CDDefend,
@@ -58,16 +52,16 @@ public partial class SaveData : Node
5852
#region Coder
5953
public static Player Coder { get; set; } = new()
6054
{
61-
PlayerName = "The Coder",
55+
PlayerName = "P_CODER",
6256
HealthMax = 70,
6357
Health = 70,
6458
EnergyMax = 4,
6559
Energy = 4,
6660
Agility = 10,
67-
AttackCardNum = 6,
61+
AttackCardNum = 3,
6862
BashCardNum = 0,
6963
DoubleBeatCardNum = 0,
70-
DefendCardNum = 6,
64+
DefendCardNum = 3,
7165
ConsolidateCardNum = 0,
7266
EcsCardNum = 0,
7367
FuryCardNum = 0,
@@ -85,12 +79,6 @@ public partial class SaveData : Node
8579
CardData.CAStrike,
8680
CardData.CAStrike,
8781
CardData.CAStrike,
88-
CardData.CAStrike,
89-
CardData.CAStrike,
90-
CardData.CAStrike,
91-
CardData.CDDefend,
92-
CardData.CDDefend,
93-
CardData.CDDefend,
9482
CardData.CDDefend,
9583
CardData.CDDefend,
9684
CardData.CDDefend,
@@ -104,16 +92,16 @@ public partial class SaveData : Node
10492
#region Hardware Warrior
10593
public static Player HardwareWarrior { get; set; } = new()
10694
{
107-
PlayerName = "Hardware Warrior",
95+
PlayerName = "P_HARDWARE",
10896
HealthMax = 100,
10997
Health = 100,
11098
EnergyMax = 4,
11199
Energy = 4,
112100
Agility = 10,
113-
AttackCardNum = 6,
101+
AttackCardNum = 3,
114102
BashCardNum = 0,
115103
DoubleBeatCardNum = 0,
116-
DefendCardNum = 6,
104+
DefendCardNum = 3,
117105
ConsolidateCardNum = 0,
118106
EcsCardNum = 0,
119107
FuryCardNum = 0,
@@ -131,12 +119,6 @@ public partial class SaveData : Node
131119
CardData.CAStrike,
132120
CardData.CAStrike,
133121
CardData.CAStrike,
134-
CardData.CAStrike,
135-
CardData.CAStrike,
136-
CardData.CAStrike,
137-
CardData.CDDefend,
138-
CardData.CDDefend,
139-
CardData.CDDefend,
140122
CardData.CDDefend,
141123
CardData.CDDefend,
142124
CardData.CDDefend,
@@ -150,16 +132,16 @@ public partial class SaveData : Node
150132
#region Signal Master
151133
public static Player SignalMaster { get; set; } = new()
152134
{
153-
PlayerName = "Yang Zhang",
135+
PlayerName = "P_SIGNAL",
154136
HealthMax = 100,
155137
Health = 100,
156138
EnergyMax = 4,
157139
Energy = 4,
158140
Agility = 10,
159-
AttackCardNum = 6,
141+
AttackCardNum = 3,
160142
BashCardNum = 0,
161143
DoubleBeatCardNum = 0,
162-
DefendCardNum = 6,
144+
DefendCardNum = 3,
163145
ConsolidateCardNum = 0,
164146
EcsCardNum = 0,
165147
FuryCardNum = 0,
@@ -177,12 +159,6 @@ public partial class SaveData : Node
177159
CardData.CAStrike,
178160
CardData.CAStrike,
179161
CardData.CAStrike,
180-
CardData.CAStrike,
181-
CardData.CAStrike,
182-
CardData.CAStrike,
183-
CardData.CDDefend,
184-
CardData.CDDefend,
185-
CardData.CDDefend,
186162
CardData.CDDefend,
187163
CardData.CDDefend,
188164
CardData.CDDefend,

‎Scripts/Maps/PieceBattle.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,6 @@ public void PreCheckGameOver(BattlePiece battlePiece)
890890
CardBattle.ResetCards(SaveData.Coder.BattleCards);
891891
CardBattle.ResetCards(SaveData.HardwareWarrior.BattleCards);
892892
CardBattle.ResetCards(SaveData.SignalMaster.BattleCards);
893-
SaveData.Save();
894893
_sceneSwitcher.PushScene(SceneSwitcher.CardsSelectionScene);
895894
}
896895
}

‎Scripts/UI/CardsSelection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void OnCardSelected(CardInfo cardInfo)
116116
{
117117
SaveData.SignalMaster.BattleCards.DeckCards.Add(card);
118118
}
119-
119+
SaveData.Save();
120120
_sceneSwitcher.PushScene(SceneSwitcher.GameWinScene);
121121
}
122122

0 commit comments

Comments
 (0)