NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save_Pet_MenuBack

This commit is contained in:
Ino 2025-08-07 22:08:29 +09:00
parent a17746ab9d
commit a6c8138e51
8 changed files with 135 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js
View File

@ -478,7 +478,11 @@ function Add_Item(table, itemtable, urod, itemid, amount, isCheat)
break; break;
case "Pet": case "Pet":
if (!urod.Pet[itemid]) urod.Pet[itemid] = [0, 1]; if (!urod.Pet[itemid])
{
urod.Pet[itemid] = [0, 1];
amount = amount - 1;
}
urod.Pet[itemid][0] = Add_Amount(urod.Pet[itemid][0], amount); urod.Pet[itemid][0] = Add_Amount(urod.Pet[itemid][0], amount);
break; break;
@ -2036,9 +2040,49 @@ handlers.Save_Pet_MenuBack = function(args)
Add_MissionCount(table, urod, "PET_MOUNT_LIMIT", 0, 1); Add_MissionCount(table, urod, "PET_MOUNT_LIMIT", 0, 1);
} }
var pettable = Get_PetTable();
var petupgradetable = Get_PetUpgradeTable();
var optiontable = Get_OptionConfigTable();
var matID = Get_GlobalValue_nValue("n_PetReinforceMaterialID");
var totalcount = 0;
var reinforceDict = args.MenuBackData.dic_Reinforce;
for (var r = 0; r < reinforceDict.length; ++r)
{
var petid = reinforceDict[r].Key;
if (IsObtainItem(urod, petid))
{
var reinforceCount = reinforceDict[r].Value;
for (var i = 0; i < reinforceCount; ++i)
{
var grade = pettable.find(f=>f.n_PetID == petid).n_PetGrade;
var lv = urod.Pet[petid][1];
var petupgrade_data = petupgradetable.find(f=>f.n_UpgradeLv == lv);
var needCard = grade < 4 ? petupgrade_data.n_LowPetCost : grade < 7 ? petupgrade_data.n_MidPetCost : petupgrade_data.n_HighPetCost;
var optionid = grade < 4 ? Get_GlobalValue_nValue("n_PetReinforcePriceOptionID1") :
grade < 7 ? Get_GlobalValue_nValue("n_PetReinforcePriceOptionID2") :
Get_GlobalValue_nValue("n_PetReinforcePriceOptionID3");
var optionData = optiontable.find(f=>f.n_OptionID == optionid);
var needMat = Get_K_Value(lv, optionData.f_BalanceConstant, optionData.n_DefaultValue, optionData.f_LevelPerValue);
if (Check_ItemAmount(urod, petid, needCard) && Check_ItemAmount(urod, matID, needMat))
{
Use_Item(table, urod, petid, needCard);
Use_Item(table, urod, matID, needMat);
++urod.Pet[petid][1];
++totalcount;
}
}
}
}
Add_MissionCount(table, urod, "PET_UPGRADE_ALL", 0, totalcount);
Add_MissionCount(table, urod, "PET_UPGRADE_ACC", 0, totalcount);
Set_JsonUserData(urod); Set_JsonUserData(urod);
return Get_Return(0, { return Get_Return(0, {
equipPetID: urod.Equip.Equip["Pet"] equipPetID: urod.Equip.Equip["Pet"],
TotalReinforceCount : totalcount,
Pet: urod.Pet,
MatAmount: Get_ItemAmount(urod, matID)
}); });
} }
handlers.Save_Pet_Gacha = function(args) handlers.Save_Pet_Gacha = function(args)
@ -20091,13 +20135,13 @@ function Get_OptionConfigTable()
}, },
{ {
"n_OptionID": "330003", "n_OptionID": "330003",
"n_DefaultValue": "0", "n_DefaultValue": "1",
"f_LevelPerValue": "20", "f_LevelPerValue": "20",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
{ {
"n_OptionID": "330004", "n_OptionID": "330004",
"n_DefaultValue": "0", "n_DefaultValue": "1",
"f_LevelPerValue": "20", "f_LevelPerValue": "20",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
@ -20145,13 +20189,13 @@ function Get_OptionConfigTable()
}, },
{ {
"n_OptionID": "330103", "n_OptionID": "330103",
"n_DefaultValue": "0", "n_DefaultValue": "2",
"f_LevelPerValue": "30", "f_LevelPerValue": "30",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
{ {
"n_OptionID": "330104", "n_OptionID": "330104",
"n_DefaultValue": "0", "n_DefaultValue": "2",
"f_LevelPerValue": "30", "f_LevelPerValue": "30",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
@ -20187,19 +20231,19 @@ function Get_OptionConfigTable()
}, },
{ {
"n_OptionID": "340001", "n_OptionID": "340001",
"n_DefaultValue": "10000", "n_DefaultValue": "1",
"f_LevelPerValue": "1", "f_LevelPerValue": "1",
"f_BalanceConstant": "0.1" "f_BalanceConstant": "0.1"
}, },
{ {
"n_OptionID": "340002", "n_OptionID": "340002",
"n_DefaultValue": "20000", "n_DefaultValue": "2",
"f_LevelPerValue": "2", "f_LevelPerValue": "2",
"f_BalanceConstant": "0.2" "f_BalanceConstant": "0.2"
}, },
{ {
"n_OptionID": "340003", "n_OptionID": "340003",
"n_DefaultValue": "30000", "n_DefaultValue": "3",
"f_LevelPerValue": "3", "f_LevelPerValue": "3",
"f_BalanceConstant": "0.3" "f_BalanceConstant": "0.3"
} }

2
Assets/ResWork/Table/Export/OptionConfig.json
View File

@ -1 +1 @@
[{"n_OptionID": "330001", "e_OptionType": "KillToMP", "n_DefaultValue": "90", "f_LevelPerValue": "1", "f_BalanceConstant": "0", "f_ExtraValue1": "0.5", "f_ExtraValue2": "1", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330002", "e_OptionType": "KillToHP", "n_DefaultValue": "90", "f_LevelPerValue": "1", "f_BalanceConstant": "0", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330003", "e_OptionType": "Pet_ATK_Multiplier", "n_DefaultValue": "1", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "5", "f_ExtraValue2": "0.25", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330004", "e_OptionType": "Pet_HP_Multiplier", "n_DefaultValue": "1", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330005", "e_OptionType": "ATK", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330006", "e_OptionType": "DEF", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330007", "e_OptionType": "MaxHP", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330008", "e_OptionType": "MaxMP", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330009", "e_OptionType": "M_DEF", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330101", "e_OptionType": "KillToMP", "n_DefaultValue": "90", "f_LevelPerValue": "2", "f_BalanceConstant": "0", "f_ExtraValue1": "0.5", "f_ExtraValue2": "1", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330102", "e_OptionType": "KillToHP", "n_DefaultValue": "90", "f_LevelPerValue": "2", "f_BalanceConstant": "0", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330103", "e_OptionType": "Pet_ATK_Multiplier", "n_DefaultValue": "2", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "5", "f_ExtraValue2": "0.25", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330104", "e_OptionType": "Pet_HP_Multiplier", "n_DefaultValue": "2", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330105", "e_OptionType": "ATK", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330106", "e_OptionType": "DEF", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330107", "e_OptionType": "MaxHP", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330108", "e_OptionType": "MaxMP", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330109", "e_OptionType": "M_DEF", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "340001", "e_OptionType": "Pet_Reinforce_Price", "n_DefaultValue": "10000", "f_LevelPerValue": "1", "f_BalanceConstant": "0.1", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "340002", "e_OptionType": "Pet_Reinforce_Price", "n_DefaultValue": "20000", "f_LevelPerValue": "2", "f_BalanceConstant": "0.2", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "340003", "e_OptionType": "Pet_Reinforce_Price", "n_DefaultValue": "30000", "f_LevelPerValue": "3", "f_BalanceConstant": "0.3", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}] [{"n_OptionID": "330001", "e_OptionType": "KillToMP", "n_DefaultValue": "90", "f_LevelPerValue": "1", "f_BalanceConstant": "0", "f_ExtraValue1": "0.5", "f_ExtraValue2": "1", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330002", "e_OptionType": "KillToHP", "n_DefaultValue": "90", "f_LevelPerValue": "1", "f_BalanceConstant": "0", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330003", "e_OptionType": "Pet_ATK_Multiplier", "n_DefaultValue": "1", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "5", "f_ExtraValue2": "0.25", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330004", "e_OptionType": "Pet_HP_Multiplier", "n_DefaultValue": "1", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330005", "e_OptionType": "ATK", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330006", "e_OptionType": "DEF", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330007", "e_OptionType": "MaxHP", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330008", "e_OptionType": "MaxMP", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330009", "e_OptionType": "M_DEF", "n_DefaultValue": "10", "f_LevelPerValue": "20", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330101", "e_OptionType": "KillToMP", "n_DefaultValue": "90", "f_LevelPerValue": "2", "f_BalanceConstant": "0", "f_ExtraValue1": "0.5", "f_ExtraValue2": "1", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330102", "e_OptionType": "KillToHP", "n_DefaultValue": "90", "f_LevelPerValue": "2", "f_BalanceConstant": "0", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330103", "e_OptionType": "Pet_ATK_Multiplier", "n_DefaultValue": "2", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "5", "f_ExtraValue2": "0.25", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330104", "e_OptionType": "Pet_HP_Multiplier", "n_DefaultValue": "2", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330105", "e_OptionType": "ATK", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330106", "e_OptionType": "DEF", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330107", "e_OptionType": "MaxHP", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330108", "e_OptionType": "MaxMP", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "330109", "e_OptionType": "M_DEF", "n_DefaultValue": "10", "f_LevelPerValue": "30", "f_BalanceConstant": "0.0015", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "340001", "e_OptionType": "Pet_Reinforce_Price", "n_DefaultValue": "1", "f_LevelPerValue": "1", "f_BalanceConstant": "0.1", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "340002", "e_OptionType": "Pet_Reinforce_Price", "n_DefaultValue": "2", "f_LevelPerValue": "2", "f_BalanceConstant": "0.2", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}, {"n_OptionID": "340003", "e_OptionType": "Pet_Reinforce_Price", "n_DefaultValue": "3", "f_LevelPerValue": "3", "f_BalanceConstant": "0.3", "f_ExtraValue1": "0", "f_ExtraValue2": "0", "f_ExtraValue3": "0", "f_ExtraValue4": "0"}]

14
Assets/ResWork/Table/Server/server_OptionConfig.txt
View File

@ -13,13 +13,13 @@
}, },
{ {
"n_OptionID": "330003", "n_OptionID": "330003",
"n_DefaultValue": "0", "n_DefaultValue": "1",
"f_LevelPerValue": "20", "f_LevelPerValue": "20",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
{ {
"n_OptionID": "330004", "n_OptionID": "330004",
"n_DefaultValue": "0", "n_DefaultValue": "1",
"f_LevelPerValue": "20", "f_LevelPerValue": "20",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
@ -67,13 +67,13 @@
}, },
{ {
"n_OptionID": "330103", "n_OptionID": "330103",
"n_DefaultValue": "0", "n_DefaultValue": "2",
"f_LevelPerValue": "30", "f_LevelPerValue": "30",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
{ {
"n_OptionID": "330104", "n_OptionID": "330104",
"n_DefaultValue": "0", "n_DefaultValue": "2",
"f_LevelPerValue": "30", "f_LevelPerValue": "30",
"f_BalanceConstant": "0.0015" "f_BalanceConstant": "0.0015"
}, },
@ -109,19 +109,19 @@
}, },
{ {
"n_OptionID": "340001", "n_OptionID": "340001",
"n_DefaultValue": "10000", "n_DefaultValue": "1",
"f_LevelPerValue": "1", "f_LevelPerValue": "1",
"f_BalanceConstant": "0.1" "f_BalanceConstant": "0.1"
}, },
{ {
"n_OptionID": "340002", "n_OptionID": "340002",
"n_DefaultValue": "20000", "n_DefaultValue": "2",
"f_LevelPerValue": "2", "f_LevelPerValue": "2",
"f_BalanceConstant": "0.2" "f_BalanceConstant": "0.2"
}, },
{ {
"n_OptionID": "340003", "n_OptionID": "340003",
"n_DefaultValue": "30000", "n_DefaultValue": "3",
"f_LevelPerValue": "3", "f_LevelPerValue": "3",
"f_BalanceConstant": "0.3" "f_BalanceConstant": "0.3"
} }

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

15
Assets/Script/Server/ServerClass.cs
View File

@ -3166,7 +3166,8 @@ public class SC_EquipmentMenuBackResult
} }
public class SC_PetMenuBackResult public class SC_PetMenuBackResult
{ {
public int equipPetID; public int equipPetID, MatAmount, TotalReinforceCount;
public Dictionary<string, List<int>> Pet;
} }
public class SC_PetGachaResult public class SC_PetGachaResult
{ {
@ -3280,4 +3281,16 @@ public class CS_EquipmentMenuBackData
return false; return false;
} }
} }
public class CS_PetMenuBackData
{
public Dictionary<int, int> dic_Reinforce = new Dictionary<int, int>();
public void Add_PetReinforceData(int id)
{
if (!dic_Reinforce.ContainsKey(id))
dic_Reinforce[id] = 1;
else
++dic_Reinforce[id];
}
}
#endregion #endregion

7
Assets/Script/Server/ServerInfo.cs
View File

@ -1888,7 +1888,7 @@ public class ServerInfo : MyCoroutine
}); });
} }
public void Save_Pet_MenuBack(int petid, Action<SC_PetMenuBackResult> _act) public void Save_Pet_MenuBack(int petid, CS_PetMenuBackData data, Action<SC_PetMenuBackResult> _act)
{ {
NetWait.Ins.Set(true); NetWait.Ins.Set(true);
PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest
@ -1899,6 +1899,7 @@ public class ServerInfo : MyCoroutine
{ {
Token = m_LoginInfo.EntityToken.EntityToken, Token = m_LoginInfo.EntityToken.EntityToken,
PetID = petid, PetID = petid,
MenuBackData = data,
} }
}, },
result => result =>
@ -1911,11 +1912,11 @@ public class ServerInfo : MyCoroutine
_act?.Invoke(JsonConvert.DeserializeObject<SC_PetMenuBackResult>(str_result)); _act?.Invoke(JsonConvert.DeserializeObject<SC_PetMenuBackResult>(str_result));
} }
else else
Set_Coroutine(() => { Save_Pet_MenuBack(petid, _act); }, 2f); Set_Coroutine(() => { Save_Pet_MenuBack(petid, data, _act); }, 2f);
}, },
fail => fail =>
{ {
Set_Coroutine(() => { Save_Pet_MenuBack(petid, _act); }, 2f); Set_Coroutine(() => { Save_Pet_MenuBack(petid, data, _act); }, 2f);
}); });
} }
public void Save_Pet_Gacha(bool isad, int amount, Action<SC_PetGachaResult> _act) public void Save_Pet_Gacha(bool isad, int amount, Action<SC_PetGachaResult> _act)

21
Assets/Script/UI/Pet/PetUI.cs
View File

@ -7,6 +7,7 @@ public class PetUI : BotMenuBase
public PetSkillDetailUI m_PetSkillDetailUI; public PetSkillDetailUI m_PetSkillDetailUI;
public PetInfoDetailUI m_PetInfoDetailUI; public PetInfoDetailUI m_PetInfoDetailUI;
public CS_PetMenuBackData m_PetMenuBackData = new CS_PetMenuBackData();
Dictionary<eItem, int> dic_EnterID = new Dictionary<eItem, int> { { eItem.Pet, 0 } }; Dictionary<eItem, int> dic_EnterID = new Dictionary<eItem, int> { { eItem.Pet, 0 } };
public override void Set() public override void Set()
@ -16,6 +17,7 @@ public class PetUI : BotMenuBase
Set_Money(table_GlobalValue.Ins.Get_Int("n_CashItemID"), table_GlobalValue.Ins.Get_Int("n_PetReinforceMaterialID")); Set_Money(table_GlobalValue.Ins.Get_Int("n_CashItemID"), table_GlobalValue.Ins.Get_Int("n_PetReinforceMaterialID"));
Set_EnterID(eItem.Pet, ServerInfo.Ins.m_ServerData.Get_EqiupmentEquip(eItem.Pet)); Set_EnterID(eItem.Pet, ServerInfo.Ins.m_ServerData.Get_EqiupmentEquip(eItem.Pet));
m_PetMenuBackData.dic_Reinforce.Clear();
} }
public void Set_EnterID(eItem item, int id) { dic_EnterID[item] = id; } public void Set_EnterID(eItem item, int id) { dic_EnterID[item] = id; }
@ -26,13 +28,22 @@ public class PetUI : BotMenuBase
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;
bool changePet = Get_EnterID(eItem.Pet) > 0 && Get_EnterID(eItem.Pet) != sdata.Get_EqiupmentEquip(eItem.Pet); bool changePet = Get_EnterID(eItem.Pet) > 0 && Get_EnterID(eItem.Pet) != sdata.Get_EqiupmentEquip(eItem.Pet);
if (changePet) if (changePet || m_PetMenuBackData.dic_Reinforce.Count > 0)
{ {
ServerInfo.Ins.Save_Pet_MenuBack(sdata.Get_EqiupmentEquip(eItem.Pet), result => ServerInfo.Ins.Save_Pet_MenuBack(sdata.Get_EqiupmentEquip(eItem.Pet), m_PetMenuBackData, result =>
{ {
sdata.Equip.Set_Equip(eItem.Pet, result.equipPetID); if (changePet)
PCInfo.Ins.Make_Pet(false, sdata, MyValue.MyPC); {
sdata.Add_MissionCount(ePurpose.PET_MOUNT_LIMIT); sdata.Equip.Set_Equip(eItem.Pet, result.equipPetID);
PCInfo.Ins.Make_Pet(false, sdata, MyValue.MyPC);
sdata.Add_MissionCount(ePurpose.PET_MOUNT_LIMIT);
}
sdata.Pet = DSUtil.Get_T_Dic(result.Pet);
sdata.Set_Item(table_GlobalValue.Ins.Get_Int("n_PetReinforceMaterialID"), result.MatAmount);
sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ACC, 0, result.TotalReinforceCount);
sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ALL, 0, result.TotalReinforceCount);
base.OnClick_Back(); base.OnClick_Back();
}); });
} }

54
Assets/Script/UI/Pet/PetUI_Right.cs
View File

@ -1,3 +1,4 @@
using System.Collections.Generic;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@ -109,26 +110,51 @@ public class PetUI_Right : uScrollViewMgr
{ {
if (CanReinforce(true)) if (CanReinforce(true))
{ {
var sdata = ServerInfo.Ins.m_ServerData;
var petData = Get_SelectPetData(); var petData = Get_SelectPetData();
ServerInfo.Ins.Save_Pet_LvUp(petData.n_PetID, result => var lv = sdata.Get_PetLv(petData.n_PetID);
{ var Tdata = table_petupgrade.Ins.Get_Data_orNull(lv);
var sdata = ServerInfo.Ins.m_ServerData; var matID = table_GlobalValue.Ins.Get_Int("n_PetReinforceMaterialID");
var matID = table_GlobalValue.Ins.Get_Int("n_PetReinforceMaterialID");
sdata.Use_Item(petData.n_PetID, result.usepet); sdata.Use_Item(petData.n_PetID, Tdata.Get_PetCost(petData.n_PetGrade));
sdata.Use_Item(matID, result.usemat); sdata.Use_Item(matID, Tdata.Get_Price(petData.n_PetGrade, lv));
sdata.Add_PetLv(petData.n_PetID); sdata.Add_PetLv(petData.n_PetID);
sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ACC); NewGameUI.Ins.m_PetUI.m_PetMenuBackData.Add_PetReinforceData(petData.n_PetID);
sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ALL);
// 왼쪽 정보 설정 //sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ACC);
m_PetUI_Left.Set(Get_SelectPetData()); //sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ALL);
// 오른쪽 정보 설정
Set_UI(); // 모든 ui 갱신
}); Set_Scroll();
SelectPet(m_SelectPet);
} }
} }
//public void OnClick_Reinforce()
//{
// if (CanReinforce(true))
// {
// var petData = Get_SelectPetData();
// ServerInfo.Ins.Save_Pet_LvUp(petData.n_PetID, result =>
// {
// var sdata = ServerInfo.Ins.m_ServerData;
// var matID = table_GlobalValue.Ins.Get_Int("n_PetReinforceMaterialID");
// sdata.Use_Item(petData.n_PetID, result.usepet);
// sdata.Use_Item(matID, result.usemat);
// sdata.Add_PetLv(petData.n_PetID);
// sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ACC);
// sdata.Add_MissionCount(ePurpose.PET_UPGRADE_ALL);
// // 왼쪽 정보 설정
// m_PetUI_Left.Set(Get_SelectPetData());
// // 오른쪽 정보 설정
// Set_UI();
// });
// }
//}
public PetListTableData Get_SelectPetData() { return m_SelectPet.Get_Data() as PetListTableData; } public PetListTableData Get_SelectPetData() { return m_SelectPet.Get_Data() as PetListTableData; }
} }