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

Merge branch 'develop' of bitbucket.org:usaya/popcorn into release

This commit is contained in:
atusi 2022-03-12 11:57:30 +09:00
parent 411acbae75 9e48deb4db
commit 3ecd691610
3 changed files with 92 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity
View File

@ -678,7 +678,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 48a19685ae3cb4a35a515ce2008d356f, type: 3}
m_Sprite: {fileID: 21300000, guid: 3acd48f1b6c81e443a46bc4ab8d73cc9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2001,7 +2001,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f015130537791494d8863270c6ad48a2, type: 3}
m_Sprite: {fileID: 21300000, guid: 44ace36fbac0cf04ab64b7662510f857, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2240,7 +2240,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 688f8e948445445d88cc957d0ac66719, type: 3}
m_Sprite: {fileID: 21300000, guid: 98a9ddfc9714daf4e8adb9bc86f701c8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3320,7 +3320,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: fd0d691e900debc4fa12c1a39bc60098, type: 3}
m_Sprite: {fileID: 21300000, guid: 5af21af3758285443984ca29acf06c80, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -3544,7 +3544,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3}
m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

30
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -1778,6 +1778,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1629640654}
--- !u!114 &419438836
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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 714437467}
--- !u!1 &438315598
GameObject:
m_ObjectHideFlags: 0
@ -3971,6 +3984,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4290223053080632699, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: mLocalizeTarget
value:
objectReference: {fileID: 419438836}
- target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_IsActive
@ -4047,6 +4065,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 817f9d5cab724bb8a22de5e9dbd2f967, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &714437467 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2120334880664306397, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 714437464}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &716489324
GameObject:
m_ObjectHideFlags: 0

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

@ -9044,9 +9044,9 @@ MonoBehaviour:
Description:
Languages:
- "\u7551\u306E\u601D\u3044\u51FA"
-
-
-
- "\u7530\u5730\u7684\u56DE\u5FC6"
- "\u7530\u5730\u7684\u56DE\u61B6"
- ShopHistoryText0001
Flags: 00000000
Languages_Touch: []
- Term: Item/ShopHistoryText0002
@ -9054,9 +9054,9 @@ MonoBehaviour:
Description:
Languages:
- "\u4ED5\u5165\u308C\u306E\u601D\u3044\u51FA"
-
-
-
- "\u91C7\u8D2D\u7684\u56DE\u5FC6"
- "\u63A1\u8CFC\u7684\u56DE\u61B6"
- ShopHistoryText0002
Flags: 00000000
Languages_Touch: []
- Term: Item/ShopHistoryText0003
@ -9064,8 +9064,58 @@ MonoBehaviour:
Description:
Languages:
- "\u7BA1\u7406\u306E\u601D\u3044\u51FA"
- "\u7BA1\u7406\u7684\u56DE\u5FC6 "
- "\u7BA1\u7406\u7684\u56DE\u61B6"
- ShopHistoryText0003
Flags: 00000000
Languages_Touch: []
- Term: ui_Settings_button_icon_explanation_logo
TermType: 5
Description:
Languages:
- ui_Settings_button_icon_explanation_logo
- Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh[ui_Settings_button_icon_explanation_logo_zh]
-
-
Flags: 00000000
Languages_Touch: []
- Term: ui_Settings_explanation_HowToPlay_Dither
TermType: 5
Description:
Languages:
- ui_Settings_explanation_HowToPlay_Dither
- Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither[ui_Settings_explanation_HowToPlay_zh_Dither]
-
-
Flags: 00000000
Languages_Touch: []
- Term: ui_Settings_explanation_popcorn_Dither
TermType: 5
Description:
Languages:
- ui_Settings_explanation_popcorn_Dither
- Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither[ui_Settings_explanation_popcorn_zh_Dither]
-
-
Flags: 00000000
Languages_Touch: []
- Term: ui_Settings_explanation_stock_Dither
TermType: 5
Description:
Languages:
- ui_Settings_explanation_stock_Dither
- Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither[ui_Settings_explanation_stock_zh_Dither]
-
-
Flags: 00000000
Languages_Touch: []
- Term: ui_button_icon_Footer_publicityVip_logo
TermType: 5
Description:
Languages:
- ui_button_icon_Footer_publicityVip_logo
- Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh[ui_button_icon_Footer_publicityVip_logo_zh]
-
-
Flags: 00000000
Languages_Touch: []
@ -9090,7 +9140,7 @@ MonoBehaviour:
Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec
Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8
Google_SpreadsheetName: I2Loc popcorn Localization
Google_LastUpdatedVersion: 1645608914960
Google_LastUpdatedVersion: 1645692358485
Google_Password: change_this
GoogleUpdateFrequency: 1
GoogleInEditorCheckFrequency: 1