Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2
commit
926fac526a
335 changed files with 2016 additions and 823 deletions
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@ |
|||||||
fileFormatVersion: 2 |
fileFormatVersion: 2 |
||||||
guid: b7807ab95cf695941b9ebf15b67dff8c |
guid: 2fc745ad362de6743a978da4a227d411 |
||||||
folderAsset: yes |
folderAsset: yes |
||||||
DefaultImporter: |
DefaultImporter: |
||||||
externalObjects: {} |
externalObjects: {} |
||||||
@ -0,0 +1,17 @@ |
|||||||
|
%YAML 1.1 |
||||||
|
%TAG !u! tag:unity3d.com,2011: |
||||||
|
--- !u!114 &11400000 |
||||||
|
MonoBehaviour: |
||||||
|
m_ObjectHideFlags: 0 |
||||||
|
m_CorrespondingSourceObject: {fileID: 0} |
||||||
|
m_PrefabInstance: {fileID: 0} |
||||||
|
m_PrefabAsset: {fileID: 0} |
||||||
|
m_GameObject: {fileID: 0} |
||||||
|
m_Enabled: 1 |
||||||
|
m_EditorHideFlags: 0 |
||||||
|
m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} |
||||||
|
m_Name: Firework |
||||||
|
m_EditorClassIdentifier: |
||||||
|
m_VideoLocation: 1 |
||||||
|
m_VideoPath: ..\FrozenMaterial\effect\Firework_hap.avi |
||||||
|
animationClip: {fileID: 0} |
||||||
@ -0,0 +1,8 @@ |
|||||||
|
fileFormatVersion: 2 |
||||||
|
guid: d904511c4cb78fc4188737997a36d752 |
||||||
|
NativeFormatImporter: |
||||||
|
externalObjects: {} |
||||||
|
mainObjectFileID: 0 |
||||||
|
userData: |
||||||
|
assetBundleName: |
||||||
|
assetBundleVariant: |
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue