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

Merge remote-tracking branch 'origin/feture/update_ver1.1.0' into feture/update_ver1.1.0

This commit is contained in:
kimura 2022-02-09 14:05:54 +09:00
parent c0188e8dc9 2f4711b1a4
commit 1540c84cf1
5 changed files with 54 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

310
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_advertise.anim
View File

@ -187,7 +187,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.23333333
time: 2
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -196,7 +196,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.9
time: 2.2666667
value: {x: 0, y: 0, z: 10.107}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -205,7 +205,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.3166667
time: 2.6833334
value: {x: 0, y: 0, z: 2.154}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -214,7 +214,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.7333333
time: 3.1
value: {x: 0, y: 0, z: 10.107}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -223,43 +223,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2.15
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 3.9166667
value: {x: 0, y: 0, z: 10.107}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 4.3333335
value: {x: 0, y: 0, z: 2.154}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 4.75
value: {x: 0, y: 0, z: 10.107}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 5.1666665
time: 3.5166667
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -890,16 +854,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.23333333
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2.3333333
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
@ -908,7 +863,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.0666666
time: 2
value: 1
inSlope: Infinity
outSlope: Infinity
@ -917,7 +872,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 5.3333335
time: 3.7
value: 0
inSlope: Infinity
outSlope: Infinity
@ -935,35 +890,8 @@ AnimationClip:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.23333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.1166666
value: 0
inSlope: 0
outSlope: 0
@ -972,16 +900,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.3333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.4666667
time: 2.1333334
value: 1
inSlope: 0
outSlope: 0
@ -990,7 +909,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
time: 3.3666666
value: 1
inSlope: 0
outSlope: 0
@ -999,7 +918,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.116667
time: 3.4833333
value: 0
inSlope: 0
outSlope: 0
@ -2433,7 +2352,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.23333333
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -2442,7 +2361,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9
time: 2.2666667
value: 0
inSlope: 0
outSlope: 0
@ -2451,7 +2370,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3166667
time: 2.6833334
value: 0
inSlope: 0
outSlope: 0
@ -2460,7 +2379,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.7333333
time: 3.1
value: 0
inSlope: 0
outSlope: 0
@ -2469,43 +2388,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.15
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.9166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.3333335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.1666665
time: 3.5166667
value: 0
inSlope: 0
outSlope: 0
@ -2533,7 +2416,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.23333333
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -2542,7 +2425,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9
time: 2.2666667
value: 0
inSlope: 0
outSlope: 0
@ -2551,7 +2434,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3166667
time: 2.6833334
value: 0
inSlope: 0
outSlope: 0
@ -2560,7 +2443,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.7333333
time: 3.1
value: 0
inSlope: 0
outSlope: 0
@ -2569,43 +2452,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.15
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.9166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.3333335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.1666665
time: 3.5166667
value: 0
inSlope: 0
outSlope: 0
@ -2633,7 +2480,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.23333333
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -2642,7 +2489,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9
time: 2.2666667
value: 10.107
inSlope: 0
outSlope: 0
@ -2651,7 +2498,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3166667
time: 2.6833334
value: 2.154
inSlope: 0
outSlope: 0
@ -2660,7 +2507,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.7333333
time: 3.1
value: 10.107
inSlope: 0
outSlope: 0
@ -2669,43 +2516,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.15
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.9166667
value: 10.107
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.3333335
value: 2.154
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.75
value: 10.107
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.1666665
time: 3.5166667
value: 0
inSlope: 0
outSlope: 0
@ -2724,16 +2535,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.23333333
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2.3333333
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2742,7 +2544,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 3.0666666
time: 2
value: 1
inSlope: Infinity
outSlope: Infinity
@ -2751,7 +2553,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 5.3333335
time: 3.7
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2769,35 +2571,8 @@ AnimationClip:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.23333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.36666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.1166666
value: 0
inSlope: 0
outSlope: 0
@ -2806,16 +2581,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.3333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.4666667
time: 2.1333334
value: 1
inSlope: 0
outSlope: 0
@ -2824,7 +2590,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
time: 3.3666666
value: 1
inSlope: 0
outSlope: 0
@ -2833,7 +2599,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.116667
time: 3.4833333
value: 0
inSlope: 0
outSlope: 0
@ -4735,7 +4501,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Effect_promotion
path: AnimationPivot_pink
classID: 4
script: {fileID: 0}
- curve:
@ -4745,7 +4511,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Effect_promotion
path: AnimationPivot_pink
classID: 4
script: {fileID: 0}
- curve:
@ -4755,7 +4521,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Effect_promotion
path: AnimationPivot_pink
classID: 4
script: {fileID: 0}
- curve:
@ -4915,7 +4681,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_pink
path: Effect_promotion
classID: 4
script: {fileID: 0}
- curve:
@ -4925,7 +4691,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimationPivot_pink
path: Effect_promotion
classID: 4
script: {fileID: 0}
- curve:
@ -4935,7 +4701,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimationPivot_pink
path: Effect_promotion
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0

BIN
popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 KiB

After

Width:  |  Height:  |  Size: 358 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 354 KiB

After

Width:  |  Height:  |  Size: 359 KiB

11
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab
View File

@ -245,7 +245,7 @@ GameObject:
- component: {fileID: 1628107518883220804}
- component: {fileID: 1628107518883220806}
- component: {fileID: 1628107518883220805}
- component: {fileID: 1044695538710786885}
- component: {fileID: 7214902411073109396}
m_Layer: 5
m_Name: Cooked
m_TagString: Untagged
@ -299,7 +299,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bcaa32a210d9b42b18a404bfa67d7c7f, type: 3}
m_Sprite: {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -309,7 +309,7 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1044695538710786885
--- !u!114 &7214902411073109396
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -321,7 +321,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
m_Name:
m_EditorClassIdentifier:
mTerm: ui_Main_Mission_icon_Achievement
mTerm: ui_Main_Mission_icon_Achievement_zh
mTermSecondary:
PrimaryTermModifier: 0
SecondaryTermModifier: 0
@ -335,7 +335,8 @@ MonoBehaviour:
AddSpacesToJoinedLanguages: 0
AllowLocalizedParameters: 1
AllowParameters: 1
TranslatedObjects: []
TranslatedObjects:
- {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, type: 3}
LocalizeEvent:
m_PersistentCalls:
m_Calls: []

10
popcorn/Assets/Resources/I2Languages.asset
View File

@ -8739,6 +8739,16 @@ MonoBehaviour:
-
Flags: 00000000
Languages_Touch: []
- Term: ui_Main_Mission_icon_Achievement_zh
TermType: 5
Description:
Languages:
- ui_Main_Mission_icon_Achievement
- Material/Main/Mission/ui_Main_Mission_icon_Achievement_zh[ui_Main_Mission_icon_Achievement_zh]
-
-
Flags: 00000000
Languages_Touch: []
CaseInsensitiveTerms: 0
OnMissingTranslation: 3
mTerm_AppName: