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

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

This commit is contained in:
hirokei 2022-10-05 16:02:15 +09:00
parent 2f1513a079 8b18bd346c
commit eb950f0694
6 changed files with 12643 additions and 12543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
popcorn/Assets/MyGame/Resources/ShopCityBackground.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dde3e3783cd966b49ae60d7b05200341
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6954
popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: adf9d4c1d58d24e4cb5b8d5ee097073b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

5587
popcorn/Assets/MyGame/Resources/ShopCityBackground/san_francisco.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
popcorn/Assets/MyGame/Resources/ShopCityBackground/san_francisco.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ab9e7746265a4924fb7f777dcdeec4a3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

12623
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab
View File

File diff suppressed because it is too large Load Diff