pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Kenta420 2024-05-18 23:23:15 +07:00
commit 633dcc79f2
8 changed files with 109 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xml/event/promotion_energy_drink_1_bath.xml
View file

@ -13050,6 +13050,8 @@ LIMENADE SODA" </Value>
<<<<<<< HEAD
=======
<Button>
@ -13090,6 +13092,7 @@ LIMENADE SODA" </Value>
</EventOnClick>
>>>>>>> 3eb39e13631227c2112d7384cf82a0b86c464db5
<Video>
<X> 42 </X>