Merge commit '70423fa9f27567f23088f7251e317a1301b204b3' into release_joypac

修正汉化
This commit is contained in:
xiaohui.wang 2022-04-20 17:00:46 +08:00
commit d646ef7ffe
4 changed files with 255 additions and 38 deletions

View File

@ -218,7 +218,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3}
m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -591,7 +591,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 004fade0ce34e974fb146a0502a917cf, type: 3}
m_Sprite: {fileID: 21300000, guid: dccb11677f958d1429131d3a9e07b06f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -939,7 +939,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3acd48f1b6c81e443a46bc4ab8d73cc9, type: 3}
m_Sprite: {fileID: 21300000, guid: 48a19685ae3cb4a35a515ce2008d356f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2262,7 +2262,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 44ace36fbac0cf04ab64b7662510f857, type: 3}
m_Sprite: {fileID: 21300000, guid: f015130537791494d8863270c6ad48a2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2501,7 +2501,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 98a9ddfc9714daf4e8adb9bc86f701c8, type: 3}
m_Sprite: {fileID: 21300000, guid: 688f8e948445445d88cc957d0ac66719, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3805,7 +3805,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3}
m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -539,6 +539,19 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &144845744
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: 714437469}
--- !u!1 &151001427
GameObject:
m_ObjectHideFlags: 0
@ -3133,6 +3146,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1987982871}
--- !u!114 &698043596
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: 714437468}
--- !u!1001 &699350948
PrefabInstance:
m_ObjectHideFlags: 0
@ -3634,6 +3660,12 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4,
type: 3}
- target: {fileID: 512143980313251866, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: vipMoveSpeed
@ -3757,33 +3789,24 @@ PrefabInstance:
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.x
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.y
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 800
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2120334880664306397, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 44bc300b74c808f4ca57cd189c7c5310,
type: 3}
- target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMax.y
@ -3804,6 +3827,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9,
type: 3}
- target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6,
type: 3}
- target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMax.y
@ -3949,6 +3984,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06,
type: 3}
- target: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
@ -3984,6 +4025,12 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478,
type: 3}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalPosition.x
@ -4041,13 +4088,8 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.x
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.y
value: 1.5
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
@ -4059,11 +4101,12 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
- target: {fileID: 8117515348220274205, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b128a700ffcf24ec29e2a2ce7af50858,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 510
objectReference: {fileID: 0}
- target: {fileID: 8591874021033984247, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_IsActive
@ -4107,6 +4150,78 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &714437468 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916834061038029, 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!114 &714437469 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832330421304, 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!114 &714437470 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 390120330251131619, 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!114 &714437471 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832434116137, 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!114 &714437472 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832642567898, 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!114 &714437473 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8117515348220274205, 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
@ -6814,6 +6929,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1253187542
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: 714437472}
--- !u!1 &1258737857
GameObject:
m_ObjectHideFlags: 0
@ -7223,6 +7351,19 @@ Transform:
m_Father: {fileID: 443832894}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1337379173
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: 714437471}
--- !u!1 &1384972636
GameObject:
m_ObjectHideFlags: 0
@ -7376,7 +7517,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 7
m_Sprite: {fileID: 21300000, guid: 688415c91be28344abb30a8b3354982b, type: 3}
m_Sprite: {fileID: 21300000, guid: f7e63e1fe3182469eaf65d7e512f598e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -13365,6 +13506,19 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!114 &1627996934
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: 714437473}
--- !u!1 &1629640652
GameObject:
m_ObjectHideFlags: 0
@ -13423,7 +13577,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3}
m_FontSize: 52
m_FontStyle: 1
m_BestFit: 0
@ -14166,7 +14320,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 7
m_Sprite: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3}
m_Sprite: {fileID: 21300000, guid: d777942e8381b48d48b282ceb6a85cd6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -19581,6 +19735,19 @@ Transform:
m_Father: {fileID: 760797061}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1938871612
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: 714437470}
--- !u!1 &1987982869
GameObject:
m_ObjectHideFlags: 0
@ -19652,7 +19819,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 6
m_Sprite: {fileID: 21300000, guid: 4717ef924abc849e18f0fa060a7420d3, type: 3}
m_Sprite: {fileID: 21300000, guid: 18091741dfe7f47e28f17bb1a5320de4, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0

View File

@ -9603,6 +9603,56 @@ MonoBehaviour:
- ShopLevelText0020
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_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: []
- 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_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_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: []
CaseInsensitiveTerms: 0
OnMissingTranslation: 3
mTerm_AppName: