yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-11-19 12:54:45 +09:00
parent e6e51ea39e e62c894d21
commit 2cd43bec6a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resources/Data/BulkOrderTextData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
WpLjb3vswLInLU9C9+DsmC+zxoGAkJxPaBBjnVz2/34og6KxuAWbdQVG37PnYYbd rztTeqrSuFZzDkVHZ/hCxyF3tS1TCOr5MPYWUmRPRoQlzyNdU45J/sOwOhWKiRoN

2
popcorn/Assets/MyGame/Resources/Data/MissionData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
View File

@ -855,7 +855,7 @@ MonoBehaviour:
counter: {fileID: 323920547} counter: {fileID: 323920547}
triggerThrottle: 0.2 triggerThrottle: 0.2
countDuration: 0.5 countDuration: 0.5
waitDisappeared: 3 waitDisappeared: 1.5
--- !u!223 &347092273 --- !u!223 &347092273
Canvas: Canvas:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0