Commit 0fd4662f authored by maxiaoliang's avatar maxiaoliang

合并代码

parent 9b1f86c8
...@@ -2415,8 +2415,19 @@ MonoBehaviour: ...@@ -2415,8 +2415,19 @@ MonoBehaviour:
DriverTimerTV: {fileID: 242298058} DriverTimerTV: {fileID: 242298058}
DoubleTimerTV: {fileID: 1465665560} DoubleTimerTV: {fileID: 1465665560}
AllSpeedTimerTV: {fileID: 1077363537} AllSpeedTimerTV: {fileID: 1077363537}
procetTimeObj: {fileID: 0} proTimerTv: {fileID: 70009395}
EveryDayWithDraw: {fileID: 0} StickTimerObj: {fileID: 694002146}
StickObj: {fileID: 1183343286}
MyDriverTimerObj: {fileID: 1507646506}
MyDriverObj: {fileID: 923216953}
DoubleTimerObj: {fileID: 1465665558}
DoubleObj: {fileID: 606793024}
tvrewardCoinEveryMinute: {fileID: 30418249}
tvrewardCashEveryMinute: {fileID: 154543858}
cashNumTv: {fileID: 0}
levelTv: {fileID: 920415600}
procetTimeObj: {fileID: 70009392}
EveryDayWithDraw: {fileID: 1309034794}
--- !u!1 &107878020 --- !u!1 &107878020
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -26791,7 +26802,7 @@ MonoBehaviour: ...@@ -26791,7 +26802,7 @@ MonoBehaviour:
btnSpriteArray: btnSpriteArray:
- {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3} - {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3}
- {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3} - {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3}
withdrawpage: {fileID: 1309034794}
--- !u!1 &1316945478 --- !u!1 &1316945478
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment