diff --git a/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset index e11ffbbaa..7cac21c63 100644 --- a/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset @@ -68,40 +68,44 @@ MonoBehaviour: - k__BackingField: GaugeTimeUp k__BackingField: k__BackingField: GaugeTimeUp - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: BarrelAutoSupply k__BackingField: k__BackingField: BarrelAutoSupply - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: ServerNpcUpgrade k__BackingField: k__BackingField: ServerNpcUpgrade - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: CleanerNpcUpgrade k__BackingField: k__BackingField: CleanerNpcUpgrade - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: BartenderNpcUpgrade k__BackingField: k__BackingField: BartenderNpcUpgrade - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: PassiveRandomChange k__BackingField: k__BackingField: PassiveRandomChange - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveGoldAutoGain k__BackingField: k__BackingField: PassiveGoldAutoGain - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveMakingBonus k__BackingField: k__BackingField: PassiveMakingBonus - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveServingBonus k__BackingField: k__BackingField: PassiveServingBonus - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveCleaningBonus k__BackingField: k__BackingField: PassiveCleaningBonus - k__BackingField: 2 + k__BackingField: 3 + - k__BackingField: PassiveDoubleServing + k__BackingField: + k__BackingField: PassiveDoubleServing + k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset index 603062cc0..ccdbbf3b0 100644 --- a/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset @@ -101,3 +101,7 @@ MonoBehaviour: k__BackingField: k__BackingField: PassiveCleaningBonus k__BackingField: 3 + - k__BackingField: PassiveDoubleServing + k__BackingField: + k__BackingField: PassiveDoubleServing + k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset index d0df25155..5b11cda80 100644 --- a/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset @@ -36,17 +36,17 @@ MonoBehaviour: - k__BackingField: SpeedBoost k__BackingField: k__BackingField: SpeedBoost - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 250 - k__BackingField: GoldBoost k__BackingField: k__BackingField: GoldBoost - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 250 - k__BackingField: DashCooldownReduction k__BackingField: k__BackingField: DashCooldownReduction - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 250 - k__BackingField: TipBoost k__BackingField: @@ -56,32 +56,32 @@ MonoBehaviour: - k__BackingField: GaugeTimeUp k__BackingField: k__BackingField: GaugeTimeUp - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 500 - k__BackingField: BarrelAutoSupply k__BackingField: k__BackingField: BarrelAutoSupply - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 400 - k__BackingField: ServerNpcUpgrade k__BackingField: k__BackingField: ServerNpcUpgrade - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 150 - k__BackingField: CleanerNpcUpgrade k__BackingField: k__BackingField: CleanerNpcUpgrade - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 150 - k__BackingField: BartenderNpcUpgrade k__BackingField: k__BackingField: BartenderNpcUpgrade - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 150 - k__BackingField: PassiveDoubleServing k__BackingField: k__BackingField: PassiveDoubleServing - k__BackingField: 8 + k__BackingField: 0 k__BackingField: 500 - k__BackingField: PassiveRandomChange k__BackingField: diff --git a/Assets/Resources/Excel/CardNormalDataTable.xlsx b/Assets/Resources/Excel/CardNormalDataTable.xlsx index 3207148c8..a96ba6391 100644 Binary files a/Assets/Resources/Excel/CardNormalDataTable.xlsx and b/Assets/Resources/Excel/CardNormalDataTable.xlsx differ diff --git a/Assets/Resources/Excel/CardRareDataTable.xlsx b/Assets/Resources/Excel/CardRareDataTable.xlsx index 296501716..477666587 100644 Binary files a/Assets/Resources/Excel/CardRareDataTable.xlsx and b/Assets/Resources/Excel/CardRareDataTable.xlsx differ diff --git a/Assets/Resources/Excel/CardShopDataTable.xlsx b/Assets/Resources/Excel/CardShopDataTable.xlsx index a5254da6c..c0f358191 100644 Binary files a/Assets/Resources/Excel/CardShopDataTable.xlsx and b/Assets/Resources/Excel/CardShopDataTable.xlsx differ diff --git a/Assets/Resources/JSON/CardNormalDataTable.json b/Assets/Resources/JSON/CardNormalDataTable.json index 1430f914c..0cc1bf9b2 100644 --- a/Assets/Resources/JSON/CardNormalDataTable.json +++ b/Assets/Resources/JSON/CardNormalDataTable.json @@ -53,42 +53,46 @@ }, { "Idx": "GaugeTimeUp", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "BarrelAutoSupply", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "ServerNpcUpgrade", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "CleanerNpcUpgrade", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "BartenderNpcUpgrade", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "PassiveRandomChange", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveGoldAutoGain", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveMakingBonus", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveServingBonus", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveCleaningBonus", - "Ratio": 2 + "Ratio": 3 + }, + { + "Idx": "PassiveDoubleServing", + "Ratio": 0 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/CardRareDataTable.json b/Assets/Resources/JSON/CardRareDataTable.json index b93c04732..29d8f69c7 100644 --- a/Assets/Resources/JSON/CardRareDataTable.json +++ b/Assets/Resources/JSON/CardRareDataTable.json @@ -86,5 +86,9 @@ { "Idx": "PassiveCleaningBonus", "Ratio": 3 + }, + { + "Idx": "PassiveDoubleServing", + "Ratio": 0 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/CardShopDataTable.json b/Assets/Resources/JSON/CardShopDataTable.json index 10b87ee01..1804af29e 100644 --- a/Assets/Resources/JSON/CardShopDataTable.json +++ b/Assets/Resources/JSON/CardShopDataTable.json @@ -21,17 +21,17 @@ }, { "Idx": "SpeedBoost", - "Ratio": 4, + "Ratio": 5, "Price": 250 }, { "Idx": "GoldBoost", - "Ratio": 4, + "Ratio": 5, "Price": 250 }, { "Idx": "DashCooldownReduction", - "Ratio": 4, + "Ratio": 5, "Price": 250 }, { @@ -41,32 +41,32 @@ }, { "Idx": "GaugeTimeUp", - "Ratio": 4, + "Ratio": 5, "Price": 500 }, { "Idx": "BarrelAutoSupply", - "Ratio": 4, + "Ratio": 5, "Price": 400 }, { "Idx": "ServerNpcUpgrade", - "Ratio": 4, + "Ratio": 5, "Price": 150 }, { "Idx": "CleanerNpcUpgrade", - "Ratio": 4, + "Ratio": 5, "Price": 150 }, { "Idx": "BartenderNpcUpgrade", - "Ratio": 4, + "Ratio": 5, "Price": 150 }, { "Idx": "PassiveDoubleServing", - "Ratio": 8, + "Ratio": 0, "Price": 500 }, {