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

マージ後処理

This commit is contained in:
kimura 2021-12-28 11:02:23 +09:00
parent 04b2cd2724
commit d73d3b2050
2 changed files with 154 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,6 +115,22 @@ MonoBehaviour:
-
Flags: 0000
Languages_Touch: []
- Term: UI/BulkOrderCancelPopup
TermType: 0
Description:
Languages:
- "\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u3059\u308B\u3068\r\n\u9054\u6210\u5831\u916C\u304C\u3082\u3089\u3048\u306A\u304F\u306A\u308A\r\n\u65E2\u306B\u8ABF\u7406\u3057\u305F\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306F\r\n\u8A66\u98DF\u306B\u56DE\u3055\u308C\u307E\u3059"
-
Flags: 0000
Languages_Touch: []
- Term: UI/CookingResultsBulkOrderPerfect
TermType: 0
Description:
Languages:
- "\u5927\u6210\u529F\u30DC\u30FC\u30CA\u30B9\u7372\u5F97"
-
Flags: 0000
Languages_Touch: []
- Term: UI/CornFieldMachine
TermType: 0
Description:
@ -187,6 +203,94 @@ MonoBehaviour:
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCume
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCumeCoin
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08\u53D6\u5F97\u30B3\u30A4\u30F3"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCumeLogin
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08\u30ED\u30B0\u30A4\u30F3\u6570"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCumeSales
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08\u8CA9\u58F2\u6570"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoMaterialInventory
TermType: 0
Description:
Languages:
- "\u6750\u6599\u5728\u5EAB"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoNextLevelUp
TermType: 0
Description:
Languages:
- "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoOutOfStock
TermType: 0
Description:
Languages:
- "\u5728\u5EAB\u306F\u3042\u308A\u307E\u305B\u3093"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoProductInventory
TermType: 0
Description:
Languages:
- "\u5546\u54C1\u5728\u5EAB"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoShopAchievement
TermType: 0
Description:
Languages:
- "\u79F0\u53F7"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoShopHistory
TermType: 0
Description:
Languages:
- "\u304A\u5E97\u306E\u6B69\u307F"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoShopLevel
TermType: 0
Description:
Languages:
- "\u5E97\u8217\u30EC\u30D9\u30EB"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MainMake
TermType: 0
Description:
@ -211,6 +315,14 @@ MonoBehaviour:
-
Flags: 0000
Languages_Touch: []
- Term: UI/ManagementTankTankNumber
TermType: 0
Description:
Languages:
- "\u30BF\u30F3\u30AF{0}\uFF1A{1}"
-
Flags: 0000
Languages_Touch: []
- Term: UI/ManagementTastingText
TermType: 0
Description:
@ -219,6 +331,46 @@ MonoBehaviour:
-
Flags: 0000
Languages_Touch: []
- Term: UI/MarketingTastingRestTime
TermType: 0
Description:
Languages:
- "\u6B8B\u308A"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MarketingTastingTimeUp
TermType: 0
Description:
Languages:
- "\u7D42\u4E86"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionAllDailyMissionAchieved
TermType: 0
Description:
Languages:
- "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u5168\u3066\u5B8C\u4E86\u3067\u9054\u6210"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionAllDailyMissionAchieved
TermType: 0
Description:
Languages:
- "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u5168\u3066\u5B8C\u4E86\u3067\u9054\u6210"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionDailyTimeLimit
TermType: 0
Description:
Languages:
- "\u66F4\u65B0\u307E\u3067\uFF1A{0}\u6642\u9593{1}\u5206{2}\u79D2 "
-
Flags: 0000
Languages_Touch: []
- Term: UI/RecipeChoiceLockPanelShopLevel
TermType: 0
Description:
@ -275,142 +427,6 @@ MonoBehaviour:
-
Flags: 0000
Languages_Touch: []
- Term: UI/ManagementTankTankNumber
TermType: 0
Description:
Languages:
- "\u30BF\u30F3\u30AF{0}\uFF1A{1}"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionAllDailyMissionAchieved
TermType: 0
Description:
Languages:
- "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u5168\u3066\u5B8C\u4E86\u3067\u9054\u6210"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionDailyTimeLimit
TermType: 0
Description:
Languages:
- "\u66F4\u65B0\u307E\u3067\uFF1A{0}\u6642\u9593{1}\u5206{2}\u79D2"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MarketingTastingRestTime
TermType: 0
Description:
Languages:
- "\u6B8B\u308A"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MarketingTastingTimeUp
TermType: 0
Description:
Languages:
- "\u7D42\u4E86"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCume
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCumeLogin
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08\u30ED\u30B0\u30A4\u30F3\u6570"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCumeSales
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08\u8CA9\u58F2\u6570"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoCumeCoin
TermType: 0
Description:
Languages:
- "\u7D2F\u8A08\u53D6\u5F97\u30B3\u30A4\u30F3"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoShopHistory
TermType: 0
Description:
Languages:
- "\u304A\u5E97\u306E\u6B69\u307F"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoShopAchievement
TermType: 0
Description:
Languages:
- "\u79F0\u53F7"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoShopLevel
TermType: 0
Description:
Languages:
- "\u5E97\u8217\u30EC\u30D9\u30EB"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoNextLevelUp
TermType: 0
Description:
Languages:
- "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoProductInventory
TermType: 0
Description:
Languages:
- "\u5546\u54C1\u5728\u5EAB"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoMaterialInventory
TermType: 0
Description:
Languages:
- "\u6750\u6599\u5728\u5EAB"
-
Flags: 0000
Languages_Touch: []
- Term: UI/InfoOutOfStock
TermType: 0
Description:
Languages:
- "\u5728\u5EAB\u306F\u3042\u308A\u307E\u305B\u3093"
-
Flags: 0000
Languages_Touch: []
- Term: Unit/Day
TermType: 0
Description:
Languages:
- "\u65E5"
-
Flags: 0000
Languages_Touch: []
- Term: Unit/Amount
TermType: 0
Description:
@ -419,35 +435,11 @@ MonoBehaviour:
-
Flags: 0000
Languages_Touch: []
- Term: UI/CookingResultsBulkOrderPerfect
- Term: Unit/Day
TermType: 0
Description:
Languages:
- "\u5927\u6210\u529F\u30DC\u30FC\u30CA\u30B9\u7372\u5F97"
-
Flags: 0000
Languages_Touch: []
- Term: UI/BulkOrderCancelPopup
TermType: 0
Description:
Languages:
- "\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u3059\u308B\u3068\r\n\u9054\u6210\u5831\u916C\u304C\u3082\u3089\u3048\u306A\u304F\u306A\u308A\r\n\u65E2\u306B\u8ABF\u7406\u3057\u305F\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306F\r\n\u8A66\u98DF\u306B\u56DE\u3055\u308C\u307E\u3059"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionAllDailyMissionAchieved
TermType: 0
Description:
Languages:
- "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u5168\u3066\u5B8C\u4E86\u3067\u9054\u6210"
-
Flags: 0000
Languages_Touch: []
- Term: UI/MissionDailyTimeLimit
TermType: 0
Description:
Languages:
- "\u66F4\u65B0\u307E\u3067\uFF1A{0}\u6642\u9593{1}\u5206{2}\u79D2"
- "\u65E5"
-
Flags: 0000
Languages_Touch: []

2
popcorn/Assets/ScriptLocalization.cs
View File

@ -39,7 +39,6 @@ namespace I2.Loc
{
public static string Day { get{ return LocalizationManager.GetTranslation ("Unit/Day"); } }
public static string Amount { get{ return LocalizationManager.GetTranslation ("Unit/Amount"); } }
public static string MissionDailyTimeLimit { get{ return LocalizationManager.GetTranslation ("UI/MissionDailyTimeLimit"); } }
}
}
@ -80,7 +79,6 @@ namespace I2.Loc
{
public const string Day = "Unit/Day";
public const string Amount = "Unit/Amount";
public const string MissionDailyTimeLimit = "UI/MissionDailyTimeLimit";
}
}
}