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

Merge branch 'develop' into future/I2Localization 

* develop:
  タンク情報をスプレッドシートからの読み込みに修正
  データ更新
  使用しないためスプレッドシートからnameIdを削除
  スズメのデフォルトモーションを待機アニメに変更
  フィーバー時のライト演出修正
This commit is contained in:
kimura 2021-12-27 14:45:53 +09:00
parent ef6a7e419e 8be2f4f181
commit e7285be48d
10 changed files with 1073 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
popcorn/Assets/MyGame/Resource/Animation/Bird.controller
View File

@ -111,7 +111,7 @@ AnimatorStateMachine:
m_Position: {x: 270, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: -932410687373910482}
m_Position: {x: 260, y: 100, z: 0}
m_Position: {x: 270, y: 110, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -121,4 +121,4 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -932410687373910482}
m_DefaultState: {fileID: 1446497241260807906}

837
popcorn/Assets/MyGame/Resource/Animation/FeverLightIdle.anim
View File

@ -791,6 +791,393 @@ AnimationClip:
path: FeverLight_c
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.2759982
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3833333
value: 0.115923814
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.45
value: 0.16862746
inSlope: 0.09901508
outSlope: 0.09901508
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.2759982
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.r
path: FeverLight_c/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3833333
value: 0.16862746
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.45
value: 0.008790592
inSlope: -0.021749942
outSlope: -0.021749942
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
path: FeverLight_c/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.3207547
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3833333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.3207547
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
path: FeverLight_c/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.13207549
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.16113277
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.13207549
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.r
path: FeverLight_b/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0.16686979
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
path: FeverLight_b/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.006278516
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.20784314
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.006278516
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
path: FeverLight_b/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.09433961
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.09433961
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.r
path: FeverLight_a/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.0728988
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 0.07376602
inSlope: 0.002262327
outSlope: 0.002262327
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5333333
value: 0.08627451
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.0728988
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
path: FeverLight_a/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 0.08627451
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5333333
value: 0.0051940526
inSlope: -0.008597056
outSlope: -0.008597056
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
path: FeverLight_a/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -925,6 +1312,69 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2909218340
attribute: 2526845255
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2909218340
attribute: 4215373228
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2909218340
attribute: 2334886179
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1118129434
attribute: 2526845255
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1118129434
attribute: 4215373228
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1118129434
attribute: 2334886179
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2844980761
attribute: 2526845255
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2844980761
attribute: 4215373228
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2844980761
attribute: 2334886179
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -1721,6 +2171,393 @@ AnimationClip:
path: FeverLight_c
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.2759982
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3833333
value: 0.115923814
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.45
value: 0.16862746
inSlope: 0.09901508
outSlope: 0.09901508
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.2759982
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.r
path: FeverLight_c/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3833333
value: 0.16862746
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.45
value: 0.008790592
inSlope: -0.021749942
outSlope: -0.021749942
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
path: FeverLight_c/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.3207547
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3833333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.3207547
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
path: FeverLight_c/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.13207549
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.16113277
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.13207549
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.r
path: FeverLight_b/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0.16686979
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
path: FeverLight_b/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.006278516
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.20784314
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.006278516
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
path: FeverLight_b/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.09433961
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.09433961
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.r
path: FeverLight_a/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.0728988
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 0.07376602
inSlope: 0.002262327
outSlope: 0.002262327
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5333333
value: 0.08627451
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.0728988
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.g
path: FeverLight_a/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 0.08627451
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5333333
value: 0.0051940526
inSlope: -0.008597056
outSlope: -0.008597056
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.b
path: FeverLight_a/mask (1)
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

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

@ -1 +1 @@
ZvTDYgtjl/KUnxeSo3qWIxjgm3ZzfiLl6xm1jnsZBbKahcweYkoUUdgtLiRwtGvA
PEdU9mSOfG9LQz8h8auaoklmyDITQKj5CRx+hhi76kWDZub+jaZnTRN1cLfO0ref

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

@ -1 +1 @@
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

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

225
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/FeverLight.prefab
View File

@ -1,5 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2141728687437349213
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6100349136180580486}
- component: {fileID: 4112474532181238490}
- component: {fileID: 4927899303128572388}
m_Layer: 5
m_Name: mask (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6100349136180580486
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2141728687437349213}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5211240701450417479}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4112474532181238490
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2141728687437349213}
m_CullTransparentMesh: 0
--- !u!114 &4927899303128572388
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2141728687437349213}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3ff488c33a1b24cca857cfe8b06d3ee2, type: 2}
m_Color: {r: 0.084905684, g: 0.06839624, b: 0, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3367963020893617962
GameObject:
m_ObjectHideFlags: 0
@ -4878,6 +4952,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8851559804602278608}
- {fileID: 3184352187834887696}
m_Father: {fileID: 1358427949382551085}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5027,6 +5102,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5629920291637480756}
- {fileID: 6223176534382985867}
m_Father: {fileID: 1358427949382551085}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5146,6 +5222,80 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6125540770015087930
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3184352187834887696}
- component: {fileID: 4913675468640661935}
- component: {fileID: 3877219385576262842}
m_Layer: 5
m_Name: mask (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3184352187834887696
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6125540770015087930}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0003939, y: 1.0003939, z: 1.0003939}
m_Children: []
m_Father: {fileID: 8688430198984287557}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4913675468640661935
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6125540770015087930}
m_CullTransparentMesh: 0
--- !u!114 &3877219385576262842
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6125540770015087930}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3ff488c33a1b24cca857cfe8b06d3ee2, type: 2}
m_Color: {r: 0.20754719, g: 0.047206815, b: 0, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7498265329666002026
GameObject:
m_ObjectHideFlags: 0
@ -5220,6 +5370,80 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7528535778124047250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6223176534382985867}
- component: {fileID: 3417645151564249060}
- component: {fileID: 6115937781791967375}
m_Layer: 5
m_Name: mask (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6223176534382985867
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7528535778124047250}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0003939, y: 1.0003939, z: 1.0003939}
m_Children: []
m_Father: {fileID: 9072176767545133782}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3417645151564249060
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7528535778124047250}
m_CullTransparentMesh: 0
--- !u!114 &6115937781791967375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7528535778124047250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3ff488c33a1b24cca857cfe8b06d3ee2, type: 2}
m_Color: {r: 0.14508155, g: 0, b: 0.16981131, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7938088450268634930
GameObject:
m_ObjectHideFlags: 0
@ -5310,6 +5534,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4637144605951204577}
- {fileID: 6100349136180580486}
m_Father: {fileID: 1358427949382551085}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

14
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
View File

@ -78,6 +78,7 @@ public class ProductManagement : MonoBehaviour
var tankList = view.SetTanks(PriceList);
var rarityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
foreach (var tankView in tankList)
{
tankView.SetArrow(tankView.TankNumber != 4 && tankView.TankNumber != 7 && tankView.TankNumber != gameData.StorageTanks.Count);
@ -93,16 +94,8 @@ public class ProductManagement : MonoBehaviour
tankView.SetState(TankState.Unavailable);
}
// タンク購入
var shopData = new ShopData
{
nameId = 0,
name = "タンク",
price = PriceList[tankView.TankNumber - 1],
text = "ポップコーンを保存する容器",
category = 3,
consumeType = 2,
prefabName = "tank"
};
var shopData = shopDataList.First(data => data.id == Const.ShopTankId);
// 購入可否
tankView.SetCanBuy(shopData.price <= CoinManager.Instance.OwnCoin);
@ -127,6 +120,7 @@ public class ProductManagement : MonoBehaviour
tankList[tankView.TankNumber].SetCanBuy(PriceList[tankView.TankNumber] <= CoinManager.Instance.OwnCoin);
}
};
shopData.price = PriceList[tankView.TankNumber - 1];
ShopItemPurchaseView.ShowDialog((shopData, 0), purchaseAction);
}).AddTo(tankView);
}

1
popcorn/Assets/MyGame/Scripts/Const.cs
View File

@ -10,6 +10,7 @@ public static class Const {
public static readonly int DefaultMachineLevel = 1;
public static readonly int DefaultRecipeId = 1;
public static readonly int DefaultPanId = 1;
public static readonly int ShopTankId = 20;
public static readonly int MaxShopLevel = 14;
public static readonly int TankCapacity = 20;
public static readonly int SpecialShopLevel = 9999;

4
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -171,7 +171,6 @@ public sealed class RarityData
public sealed class PanData
{
public int id;
public int nameId;
public string name;
public string text;
public int rarity;
@ -234,7 +233,6 @@ public sealed class FieldUpgradeData
public sealed class ProductData
{
public int id;
public int nameId;
public string name;
public int shopLevel;
public int price;
@ -269,7 +267,6 @@ public sealed class ProductData
public ProductData(ProductData productData, int value)
{
id = productData.id;
nameId = productData.nameId;
name = productData.name;
shopLevel = productData.shopLevel;
price = productData.price;
@ -387,7 +384,6 @@ public sealed class BrotherScriptData
[Serializable]
public sealed class ShopData {
public int id;
public int nameId;
public int itemId;
public string name;
public int price;