You've already forked taptap2024_GJ_chidouren
Merge remote-tracking branch 'origin/MapXiaoXiong'
This commit is contained in:
@@ -31,16 +31,16 @@ MonoBehaviour:
|
||||
active: 1
|
||||
color:
|
||||
m_OverrideState: 1
|
||||
m_Value: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_Value: {r: 0.17359379, g: 0.22150257, b: 0.4433962, a: 1}
|
||||
center:
|
||||
m_OverrideState: 1
|
||||
m_Value: {x: 0.5, y: 0.5}
|
||||
intensity:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0.423
|
||||
m_Value: 0.25
|
||||
smoothness:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0.216
|
||||
m_Value: 1
|
||||
rounded:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
@@ -155,7 +155,7 @@ MonoBehaviour:
|
||||
m_Value: 6
|
||||
scatter:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0.5
|
||||
m_Value: 0.6
|
||||
clamp:
|
||||
m_OverrideState: 0
|
||||
m_Value: 65472
|
||||
|
||||
4248
Assets/GameRes/AutoSource/Part/EmptyImg.prefab
Normal file
4248
Assets/GameRes/AutoSource/Part/EmptyImg.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/EmptyImg.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/EmptyImg.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 009635fb60877d94e9636d2a7d94ffc5
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
6874
Assets/GameRes/AutoSource/Part/Part1Box.prefab
Normal file
6874
Assets/GameRes/AutoSource/Part/Part1Box.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part1Box.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part1Box.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2b7f8ae6ec84c4a498c460209e57fb7e
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
21278
Assets/GameRes/AutoSource/Part/Part1Img.prefab
Normal file
21278
Assets/GameRes/AutoSource/Part/Part1Img.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part1Img.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part1Img.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 65c92eb5afe54f20abc569cb82f507b7
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
12766
Assets/GameRes/AutoSource/Part/Part2Box.prefab
Normal file
12766
Assets/GameRes/AutoSource/Part/Part2Box.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part2Box.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part2Box.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9147c58b85d7a1345873408da7e166b5
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
4248
Assets/GameRes/AutoSource/Part/Part2Img.prefab
Normal file
4248
Assets/GameRes/AutoSource/Part/Part2Img.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part2Img.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part2Img.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a62e2c2a85169504eba5b3dc1ac86285
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -616,14 +616,17 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1106398875}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
|
||||
--- !u!114 &355335389 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8247442098040652398, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
|
||||
m_PrefabInstance: {fileID: 355335388}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 1106398874}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dfce19dfebea46149e6c38028733afb0, type: 3}
|
||||
@@ -1004,6 +1007,23 @@ MonoBehaviour:
|
||||
m_BoundingShape2D: {fileID: 1944799163}
|
||||
m_Damping: 1.5
|
||||
m_MaxWindowSize: -1
|
||||
--- !u!1 &1106398874 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
|
||||
m_PrefabInstance: {fileID: 355335388}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!210 &1106398875
|
||||
SortingGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1106398874}
|
||||
m_Enabled: 1
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 10
|
||||
m_SortAtRoot: 0
|
||||
--- !u!1 &1153590224
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1221,7 +1241,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
version: 1
|
||||
data:
|
||||
dataString: UEsDBBQAAAgIAABAIezzEW4NYgIAABoFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVMly4jAQ/RVK5yFlMxBgbjNAyBwIVMhULr4Iq41VyJJLC0tS/Pu0ZBs75ETzenuvu+VPwqUpIbVKLzVnK8WA/OoRb5Mfvdb5DGe6V3LLP6CJeefM5j6IhphXarlCPPZpRhVgNU9/y73wwRGCTvJM6WLB9jBTxhqEMyoMoEsr67MlQp89csaf/tSnXNAajL31gdY06l3RTEFa0G1oExhHD4/TKIoGwzq+CncyFbQogXnubdZgUqeNqzCJquqI6OHnyPdRQnBTsyL2UgbVr/TiNTNOUWGg4QXnwPe59WW7iessM2Brippe5lzjoKqK5I+qpldQc6hoHalwvkc8mARKVdHVN38/Du5Mq+K56RtHvofNeXpAhik1tjPeLjz/StzJExUHuhPwnoN8UUutnGTotNr5VGdgMG//3qTNckgPLV5RvQNd+X1JzS69hmtQf54JXuzC2IcVsBUqzDqcAGhczF8kHA7E1CUQ9Sz+GXij++4l1Y4nro1FV61Seno75bQPJYswM6/G2ZnSEgJcky5BUmEvGyxj71d45+u0vfM8Uf9m6ua1r3kKdykBbuOj6M61UafbskyuTisw+dpZwSW0pL3jBec0U1JWF9adSZO2dTqjaSdt7zj7elpkFA0HAHSURjAcxdNpfzwe7h4nu3gyzVLIKCPh9rhEnVRsKqL1eHBrsi0u8c6aT0lvqWkZrp1pelryj0J1Rs5lprapBpDrqsKNOGhsgo+SLRjHAW3BWi7DvslnQoRKD8CSW6EkKF2craZJWyUhJT8q65GEzMK3IyEevt3yRsORw8k3b4pdyfU/UEsDBBQAAAgIAABAIey/sM2JbQAAAHgAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNEz0jM011FQSi9KLMgoBooYgjilmSkgdrSSqYGJUWpqommyQaqJqaGlpa65uUmSmUWSoYVlWnJqWmKKUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAABAIezzEW4NYgIAABoFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAABAIey/sM2JbQAAAHgAAAAJACQAAAAAAAAAAAAAAK8CAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAZwMAAAAA
|
||||
dataString: UEsDBBQAAAgIAABAIew+mA6+ZwIAAB4FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVMty2jAU/RVG65KxXaihuxYI6YKECe1k442QrrEGWfLowSMZ/r2SLLBDVlHOOffecx/mAzGhGyBGqqVidCUpoJ8D5N/o26Ajn+CEd1Js2DtcNW+MmsqLcNC8YsOkw1MfpmUNRjHyS+y4FycOtIKVUtULuoOZ1EY7uMRcg6OUND5aOOhjgE7uz3DqQ87uleX+9e5e02RwcU8CwoDqpDfhOOpamRWE47oB6j136iyL8nEWZMJ1ExXJg+eI5JzpaAaZcxOafcVn3ypl2DUWqvs+K2C7yvis/cCXstRgojOFz3Om3HzajOi3bIdWY71vXR0wt75Gmk2Cozbp6gs/TANdKlk/Xeumia9hKkb2ziHB2vSm2ofnn41bccR8j7cc3ioQz3KppBXUkUZZH2o1ZPPu31trswrIvsNbq3egbb7uJn3IJ5P0+zTPF8Mkj3vyDV3CKE4zzuptWMGoBTZchsGHMwDllvTHuQ9HomNeh3pL/zT8xbv+NUXikSltHBVbFt7rVlrlpWgRBuhbs2YmlYAAxw4aEJib89qlMff7vON6Ze+YR+y/m1g8ctfP4S4kwJ0+Se6otTzeNqcreVyBrl6s4UxAZ9oTz25OMylEe279mVzDNlaVmPTCdpbRz3eGxskoA8BjksBonE6nwzwfbX9MtulkWhIoMUXhEJlwfWK+bo3G8bitiS65cEd3/TkZLBVuwulThY9L9l7L3siZKOWGKADx0ma4GQflirgPlC4ocwPagDFMhH2jjwJxSfZAi1uiInS6OBmFiy5LgRp2kMYjBZqF348Cefh22GsFBwZHX/ya7IIu/wFQSwMEFAAACAgAAEAh7L+wzYltAAAAeAAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw0TPSMzTXUVBKL0osyCgGihiCOKWZKSB2tJKpgYlRamqiabJBqompoaWlrrm5SZKZRZKhhWVacmpaYopSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEAh7D6YDr5nAgAAHgUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEAh7L+wzYltAAAAeAAAAAkAJAAAAAAAAAAAAAAAtAIAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAABsAwAAAAA=
|
||||
upgradeData:
|
||||
file_cachedStartup: {fileID: 0}
|
||||
data_cachedStartup:
|
||||
|
||||
Reference in New Issue
Block a user