Core/NetworkPackage/DTCFile/ClientPack.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
File was deleted Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/ServerPack/HB0_Event.meta
File was deleted Core/SDK/SDKUtility.cs
@@ -1194,7 +1194,7 @@ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName; m_Json["level"] = "1"; m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString(); m_Json["gameName"] = VersionConfig.Get().productName; m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString(); m_Json["createTime"] = time; @@ -1213,7 +1213,7 @@ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName; m_Json["level"] = PlayerDatas.Instance.baseData.LV; m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString(); m_Json["gameName"] = VersionConfig.Get().productName; m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString(); @@ -1232,7 +1232,7 @@ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName; m_Json["level"] = PlayerDatas.Instance.baseData.LV; m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString(); m_Json["gameName"] = VersionConfig.Get().productName; m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString(); m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString(); Fight/GameActor/GA_Hero.cs
@@ -157,7 +157,7 @@ base.OnInit(package); ActorInfo.familyID = PlayerDatas.Instance.baseData.Family; ActorInfo.familyID = PlayerDatas.Instance.baseData.FamilyId; OnPathFinding += MapTransferUtility.Instance.OnHeroPathFinding; @@ -658,7 +658,7 @@ var _familyName = string.Empty; // 仙盟 if (PlayerDatas.Instance.baseData.Family != 0) if (PlayerDatas.Instance.baseData.FamilyId != 0) { _familyName = PlayerDatas.Instance.baseData.FamilyName; } Fight/Stage/Dungeon/DropItemManager.cs
@@ -425,7 +425,7 @@ } else if (dropObject.ownerType == 7) { if (dropObject.ownerID != PlayerDatas.Instance.baseData.Family) if (dropObject.ownerID != PlayerDatas.Instance.baseData.FamilyId) { return false; } System/Chat/LocalChatHistory.cs
@@ -191,7 +191,7 @@ } if (type == ChatInfoType.Fairy) { if (PlayerDatas.Instance.baseData.Family == 0) if (PlayerDatas.Instance.baseData.FamilyId == 0) { continue; } System/CrossServerOneVsOne/CrossSeverOneVsOneBuyMatchTimesWin.cs
@@ -74,7 +74,7 @@ if (bindGold < price) { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func13", PlayerDatas.Instance.baseData.GoldPaper, price, price - bindGold), (bool isOk) => PlayerDatas.Instance.baseData.bindDiamond, price, price - bindGold), (bool isOk) => { if (isOk) { System/DailyQuest/DailyQuestHangTimeBehaviour.cs
@@ -46,8 +46,8 @@ private void UpdateHangingTime() { var hangingHour = (int)(PlayerDatas.Instance.baseData.HappyPoint / 3600); var hangingMinute = (int)(PlayerDatas.Instance.baseData.HappyPoint % 3600 / 60); var hangingHour = (int)(PlayerDatas.Instance.baseData.hangTime / 3600); var hangingMinute = (int)(PlayerDatas.Instance.baseData.hangTime % 3600 / 60); if (hangingMinute > 0) { m_HangingTime.text = StringUtility.Contact(hangingHour, Language.Get("Hour"), hangingMinute, Language.Get("Minute")); System/DailyQuest/DailyQuestModel.cs
@@ -228,7 +228,7 @@ case DailyQuestType.FairyFeast: case DailyQuestType.FairyTask: case DailyQuestType.FairyGrabBoss: return defaultUnlock && PlayerDatas.Instance.baseData.Family > 0; return defaultUnlock && PlayerDatas.Instance.baseData.FamilyId > 0; case DailyQuestType.RuneTowerSweep: return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0; case DailyQuestType.GuardSky: System/Dungeon/DungeonBuyTimesWin.cs
@@ -145,12 +145,12 @@ Equation.Instance.AddKeyValue("hasBuyCnt", dungeonRecord.buyTimes); model.TryGetBuyCountCost(model.currentDungeon.mapId, out costFormula); int _cost = Equation.Instance.Eval<int>(costFormula); if (PlayerDatas.Instance.baseData.GoldPaper + PlayerDatas.Instance.baseData.Gold >= _cost) if (PlayerDatas.Instance.baseData.bindDiamond + PlayerDatas.Instance.baseData.diamond >= _cost) { if (PlayerDatas.Instance.baseData.GoldPaper < _cost) if (PlayerDatas.Instance.baseData.bindDiamond < _cost) { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func13", PlayerDatas.Instance.baseData.GoldPaper, _cost, _cost - PlayerDatas.Instance.baseData.GoldPaper), (bool isOk) => PlayerDatas.Instance.baseData.bindDiamond, _cost, _cost - PlayerDatas.Instance.baseData.bindDiamond), (bool isOk) => { if (isOk) { System/Dungeon/DungeonEnterInfo.cs
@@ -43,7 +43,7 @@ { if (isOk) { if (PlayerDatas.Instance.baseData.GoldPaper + PlayerDatas.Instance.baseData.Gold >= dungeonEnter.clearCoolDownCost) if (PlayerDatas.Instance.baseData.bindDiamond + PlayerDatas.Instance.baseData.diamond >= dungeonEnter.clearCoolDownCost) { model.RequestClearEnterCD(dungeonEnter.mapId); } System/Dungeon/DungeonInspireWin.cs
@@ -162,13 +162,13 @@ switch (fairyInspireConfig.InspireType) { case 1: money += PlayerDatas.Instance.baseData.Gold; money += PlayerDatas.Instance.baseData.diamond; break; case 2: money += PlayerDatas.Instance.baseData.GoldPaper; money += PlayerDatas.Instance.baseData.bindDiamond; break; case 5: money = PlayerDatas.Instance.baseData.GoldPaper + PlayerDatas.Instance.baseData.Gold; money = PlayerDatas.Instance.baseData.bindDiamond + PlayerDatas.Instance.baseData.diamond; break; } var cost = model.GetDungeonInspireCost(fairyInspireConfig); @@ -181,15 +181,15 @@ var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); var isDouble = dataMapId == DemonJarModel.DEMONJAR_MAPID && demonJarModel.isDoubleAward; bool mix = fairyInspireConfig.InspireType == 5 && PlayerDatas.Instance.baseData.GoldPaper < cost && PlayerDatas.Instance.baseData.GoldPaper > 0; var fairyCost = fairyInspireConfig.InspireType == 5 ? cost - PlayerDatas.Instance.baseData.GoldPaper : cost; bool mix = fairyInspireConfig.InspireType == 5 && PlayerDatas.Instance.baseData.bindDiamond < cost && PlayerDatas.Instance.baseData.bindDiamond > 0; var fairyCost = fairyInspireConfig.InspireType == 5 ? cost - PlayerDatas.Instance.baseData.bindDiamond : cost; fairyCost *= isDouble ? 2 : 1; if (fairyCost > 0 && (!model.inspireRemindEffective || !model.inspireNoRemind)) { ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"), mix ? Language.Get("InspireRemind1", fairyCost, PlayerDatas.Instance.baseData.GoldPaper) mix ? Language.Get("InspireRemind1", fairyCost, PlayerDatas.Instance.baseData.bindDiamond) : Language.Get("InspireRemind2", fairyCost), Language.Get("InspireNoMention"), (bool isOk, bool toggle) => { System/Dungeon/DungeonSuppliesLackWin.cs
@@ -88,7 +88,7 @@ if (own < lackItem.count) { var moneyNeed = GetUnitPrice(lackType) * (lackItem.count - own); var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyOwn < moneyNeed) { if (VersionConfig.Get().isBanShu) @@ -100,11 +100,11 @@ } else { if (PlayerDatas.Instance.baseData.GoldPaper < moneyNeed) if (PlayerDatas.Instance.baseData.bindDiamond < moneyNeed) { ConfirmCancel.ShowPopConfirm( Language.Get("Mail101"), GetBindJadeLackTip(lackType, moneyNeed, (int)PlayerDatas.Instance.baseData.GoldPaper), GetBindJadeLackTip(lackType, moneyNeed, (int)PlayerDatas.Instance.baseData.bindDiamond), (bool _ok) => { if (_ok) System/Dungeon/DungeonSweepResultWin.cs
@@ -201,7 +201,7 @@ { if (_ok) { var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyNeed > moneyOwn) { WindowCenter.Instance.Open<RechargeTipWin>(); System/Dungeon/DungeonSweepWin.cs
@@ -105,7 +105,7 @@ { if (_ok) { var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyNeed > moneyOwn) { WindowCenter.Instance.Open<RechargeTipWin>(); System/Dungeon/DungeonUseLiquidWin.cs
@@ -143,7 +143,7 @@ foreach (var _key in _dict.Keys) { if (_key == 2 && PlayerDatas.Instance.baseData.GoldPaper >= _dict[_key].MoneyNumber) && PlayerDatas.Instance.baseData.bindDiamond >= _dict[_key].MoneyNumber) { model.liquidStoreConfigs.Add(_dict[_key]); break; System/Dungeon/TrialSweepResultWin.cs
@@ -211,7 +211,7 @@ { if (_ok) { var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyNeed > moneyOwn) { WindowCenter.Instance.Open<RechargeTipWin>(); System/FairyAu/FairyCallMemberBehaviour.cs
@@ -57,7 +57,7 @@ bool CheckCallMember() { if (PlayerDatas.Instance.baseData.Family == 0 if (PlayerDatas.Instance.baseData.FamilyId == 0 || !model.grabBossHintOpen) { return false; System/FairyAu/FairyChangeTipWin.cs
@@ -34,8 +34,8 @@ int freeCnt = Mathf.Max(0, model.freeNotifyCount - (int)PlayerDatas.Instance.fairyData.fairy.Extra3); if (freeCnt < 1) { if (PlayerDatas.Instance.baseData.Gold < model.changeNotifyCost && PlayerDatas.Instance.baseData.GoldPaper < model.changeNotifyCost) if (PlayerDatas.Instance.baseData.diamond < model.changeNotifyCost && PlayerDatas.Instance.baseData.bindDiamond < model.changeNotifyCost) { if (VersionConfig.Get().isBanShu) { System/FairyAu/FairyCreateWin.cs
@@ -81,12 +81,12 @@ SysNotifyMgr.Instance.ShowTip("FamilyNameChangeUnlegal"); return; } if (PlayerDatas.Instance.baseData.GoldPaper + PlayerDatas.Instance.baseData.Gold >= model.createFairyCost) if (PlayerDatas.Instance.baseData.bindDiamond + PlayerDatas.Instance.baseData.diamond >= model.createFairyCost) { if (PlayerDatas.Instance.baseData.GoldPaper < model.createFairyCost) if (PlayerDatas.Instance.baseData.bindDiamond < model.createFairyCost) { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func36", PlayerDatas.Instance.baseData.GoldPaper, model.createFairyCost, model.createFairyCost - PlayerDatas.Instance.baseData.GoldPaper), (bool isOk) => PlayerDatas.Instance.baseData.bindDiamond, model.createFairyCost, model.createFairyCost - PlayerDatas.Instance.baseData.bindDiamond), (bool isOk) => { if (isOk) { System/FairyAu/FairyGrabBossHintWin.cs
@@ -189,7 +189,7 @@ { for (int i = 0; i < list.Count; i++) { if (list[i].FamilyID == PlayerDatas.Instance.baseData.Family) if (list[i].FamilyID == PlayerDatas.Instance.baseData.FamilyId) { rank = i + 1; percent = (int)(((float)list[i].totalHurt / totalHp) * 100); System/FairyAu/FairyGrabBossModel.cs
@@ -712,7 +712,7 @@ private void SystemNotifyEvent(string message, ArrayList arrayList) { if (message.Equals("FairyGrabBossHelp") && InActivityTime && PlayerDatas.Instance.baseData.Family != 0 && FuncOpen.Instance.IsFuncOpen(139)) && PlayerDatas.Instance.baseData.FamilyId != 0 && FuncOpen.Instance.IsFuncOpen(139)) { var npcId = 0; if (arrayList != null && arrayList.Count > 0) System/FairyAu/FairyLeagueModel.cs
@@ -707,7 +707,7 @@ { return false; } var _fairyId = PlayerDatas.Instance.baseData.Family; var _fairyId = PlayerDatas.Instance.baseData.FamilyId; if (!fairyLeagueBattleDict.ContainsKey(session)) { return false; @@ -752,7 +752,7 @@ _error = 2; return false; } if (fairyLeagueFairyId != 0 && fairyLeagueFairyId != PlayerDatas.Instance.baseData.Family) if (fairyLeagueFairyId != 0 && fairyLeagueFairyId != PlayerDatas.Instance.baseData.FamilyId) { _error = 6; return false; System/FairyAu/FairyLeagueWin.cs
@@ -289,8 +289,8 @@ else { _adaptive.Display(list[i * 4 + j].FamilyName); _adaptive.SetAdaptive(list[i * 4 + j].FamilyID == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); _adaptive.SetAdaptive(list[i * 4 + j].FamilyID == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); } } } @@ -339,8 +339,8 @@ m_StringBuilder.Append(list[0].IsFairyDissolve(list[0].GetWinFairyId()) ? Language.Get("LeagueState_Dissolve") : string.Empty); m_StringBuilder.Append(fairyClash.grade < 5 ? Language.Get("LeagueState_Promote") : string.Empty); fairyClash.clashTxt1.Display(m_StringBuilder.ToString()); fairyClash.clashTxt1.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyClash.clashTxt1.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); m_StringBuilder.Length = 0; _fairyId = list[0].GetLoserFairyId(); var loserFairyName = list[0].GetLoserFairyName(); @@ -351,8 +351,8 @@ m_StringBuilder.Append(loserFairyName); m_StringBuilder.Append(list[0].IsFairyDissolve(list[0].GetLoserFairyId()) ? Language.Get("LeagueState_Dissolve") : string.Empty); fairyClash.clashTxt2.Display(m_StringBuilder.ToString()); fairyClash.clashTxt2.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyClash.clashTxt2.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); if (list.Count < 2) { fairyClash.clashTxt3.Display(Language.Get("FamilyMatchNoOneHere")); @@ -366,8 +366,8 @@ m_StringBuilder.Append(list[1].GetWinFairyName()); m_StringBuilder.Append(list[1].IsFairyDissolve(list[1].GetWinFairyId()) ? Language.Get("LeagueState_Dissolve") : string.Empty); fairyClash.clashTxt3.Display(m_StringBuilder.ToString()); fairyClash.clashTxt3.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyClash.clashTxt3.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); m_StringBuilder.Length = 0; _fairyId = list[1].GetLoserFairyId(); loserFairyName = list[1].GetLoserFairyName(); @@ -379,8 +379,8 @@ m_StringBuilder.Append(list[1].IsFairyDissolve(list[1].GetLoserFairyId()) ? Language.Get("LeagueState_Dissolve") : string.Empty); m_StringBuilder.Append(Language.Get("LeagueState_Demotion")); fairyClash.clashTxt4.Display(m_StringBuilder.ToString()); fairyClash.clashTxt4.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyClash.clashTxt4.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); continue; } if (list == null || list.Count == 0) @@ -514,28 +514,28 @@ if (_left) { fairyNameLeft1.Display(_name); fairyNameLeft1.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyNameLeft1.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); } else { fairyNameRight1.Display(_name); fairyNameRight1.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyNameRight1.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); } break; case 1: if (_left) { fairyNameLeft2.Display(_name); fairyNameLeft2.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyNameLeft2.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); } else { fairyNameRight2.Display(_name); fairyNameRight2.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.Family && PlayerDatas.Instance.baseData.Family > 0); fairyNameRight2.SetAdaptive(_fairyId == PlayerDatas.Instance.baseData.FamilyId && PlayerDatas.Instance.baseData.FamilyId > 0); } break; } System/FindPrecious/BossHomeWin.cs
@@ -321,7 +321,7 @@ { if (_ok) { var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyOwn < moneyNeed) { if (VersionConfig.Get().isBanShu) System/FindPrecious/FindPreciousBossRebornBehaviour.cs
@@ -410,7 +410,7 @@ { if (_ok) { var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyOwn < moneyNeed) { if (VersionConfig.Get().isBanShu) System/KnapSack/New/ExtendWin.cs
@@ -149,7 +149,7 @@ (bool isOk)=> { if(isOk) { if(PlayerDatas.Instance.baseData.Gold >= needMoney) if(PlayerDatas.Instance.baseData.diamond >= needMoney) { C0741_tagCOpenPackCount openGrid = new C0741_tagCOpenPackCount(); openGrid.PackType = (byte)_packType; System/KnapSack/New/RoleEquipWin.cs
@@ -262,9 +262,9 @@ { if (PlayerDatas.Instance.baseData != null) { _moneyCount.text = PlayerDatas.Instance.baseData.Gold.ToString(); _bindDiamondCount.text = PlayerDatas.Instance.baseData.GoldPaper.ToString(); _flowDiamondCount.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(PlayerDatas.Instance.baseData.allSliver); _moneyCount.text = PlayerDatas.Instance.baseData.diamond.ToString(); _bindDiamondCount.text = PlayerDatas.Instance.baseData.bindDiamond.ToString(); _flowDiamondCount.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(PlayerDatas.Instance.baseData.allCopper); } else { System/MainInterfacePanel/InGamePushContainer.cs
@@ -328,7 +328,7 @@ { if (PlayerDatas.Instance.baseData.LV >= GeneralDefine.OffLineTimeLackRemendLevelLimit && !offLineTimeLackModel.hasRemindOffLineTimeLack && PlayerDatas.Instance.baseData.HappyPoint < 5 * 3600) && PlayerDatas.Instance.baseData.hangTime < 5 * 3600) { m_OffLineTimeLackBehaviour.gameObject.SetActive(true); } System/MainInterfacePanel/InformationTipsWin.cs
@@ -47,8 +47,8 @@ protected override void OnPreOpen() { _Gold = (int)PlayerDatas.Instance.baseData.Gold; _GoldPaper = (int)PlayerDatas.Instance.baseData.GoldPaper; _Gold = (int)PlayerDatas.Instance.baseData.diamond; _GoldPaper = (int)PlayerDatas.Instance.baseData.bindDiamond; DoubleToReceive(); }
@@ -64,10 +64,10 @@ { m_ScrollerController.OnRefreshCell += OnRefreshGridCell; OnCreateGridLineCell(m_ScrollerController); if ((int)PlayerDatas.Instance.baseData.HappyPoint > 0) if ((int)PlayerDatas.Instance.baseData.hangTime > 0) { m_CoentText_t.text = TimeText(onHookModel.mCTJGInfoClass.Time) + string.Format(Language.Get("Remaining_Z"), TimeText1((int)PlayerDatas.Instance.baseData.HappyPoint)); m_CoentText_t.text = TimeText(onHookModel.mCTJGInfoClass.Time) + string.Format(Language.Get("Remaining_Z"), TimeText1((int)PlayerDatas.Instance.baseData.hangTime)); } else { System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -73,8 +73,8 @@ LatencyTime = 0; _TextTaskDescription.text = ""; _Gold = (int)PlayerDatas.Instance.baseData.Gold; _GoldPaper = (int)PlayerDatas.Instance.baseData.GoldPaper; _Gold = (int)PlayerDatas.Instance.baseData.diamond; _GoldPaper = (int)PlayerDatas.Instance.baseData.bindDiamond; _BtnRewards.gameObject.SetActive(false); _AllMissionDict = taskmodel.allMissionDict; _TaskId = taskmodel._TaskNow; System/Market/MarketDealWin.cs
@@ -461,7 +461,7 @@ private void RefreshCostItem() { m_CostNumTxt.text = PlayerDatas.Instance.baseData.Gold.ToString(); m_CostNumTxt.text = PlayerDatas.Instance.baseData.diamond.ToString(); } private void InitType() System/PlayerDead/PlayerDeadModel.cs
@@ -317,7 +317,7 @@ public bool IsCanInplaceReborn(int rebornPrice) { playerCoins = (int)PlayerDatas.Instance.baseData.Gold + (int)PlayerDatas.Instance.baseData.GoldPaper; playerCoins = (int)PlayerDatas.Instance.baseData.diamond + (int)PlayerDatas.Instance.baseData.bindDiamond; if (playerCoins >= rebornPrice) return true; else System/Role/AutoHammerWin.cs
@@ -225,7 +225,7 @@ private void Confirm() { if (PlayerDatas.Instance.baseData.Gold < cost) if (PlayerDatas.Instance.baseData.diamond < cost) { WindowCenter.Instance.Open<RechargeTipWin>(); return; System/Role/MagicianWin.cs
@@ -1028,7 +1028,7 @@ count = Mathf.Max(1, count); count = Mathf.Min(byte.MaxValue, count); var cost = count * autoHammerCost.cost; if (PlayerDatas.Instance.baseData.Gold < cost) if (PlayerDatas.Instance.baseData.diamond < cost) { autoHammerState = AutoHammerState.None; return; System/Rune/RuneModel.cs
@@ -781,7 +781,7 @@ error = 1; return false; } if (PlayerDatas.Instance.baseData.Gold < speicalHole.cost) if (PlayerDatas.Instance.baseData.diamond < speicalHole.cost) { error = 2; return false; System/RuneTower/RuneTowerSweepBuyWin.cs
@@ -86,14 +86,14 @@ { //1.绑玉和仙玉之和不足；2.仙玉不足；3.次数不足 var moneyNeed = GeneralDefine.runeTowerSweepBuyPrice; var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.diamond + PlayerDatas.Instance.baseData.bindDiamond; if (moneyOwn < moneyNeed) { _error = 1; return false; } if (PlayerDatas.Instance.baseData.GoldPaper < moneyNeed) if (PlayerDatas.Instance.baseData.bindDiamond < moneyNeed) { _error = 2; return false; @@ -113,7 +113,7 @@ break; case 2: var moneyNeed = GeneralDefine.runeTowerSweepBuyPrice; var moneyOwn = PlayerDatas.Instance.baseData.GoldPaper; var moneyOwn = PlayerDatas.Instance.baseData.bindDiamond; var moneyLack = moneyNeed - moneyOwn; ConfirmCancel.ShowPopConfirm( Language.Get("Mail101"), System/Store/BagStoreWin.cs
@@ -235,9 +235,9 @@ { if (PlayerDatas.Instance.baseData != null) { _goldText.text = PlayerDatas.Instance.baseData.Gold.ToString(); _goldPaperText.text = PlayerDatas.Instance.baseData.GoldPaper.ToString(); _sliverText.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(PlayerDatas.Instance.baseData.allSliver); _goldText.text = PlayerDatas.Instance.baseData.diamond.ToString(); _goldPaperText.text = PlayerDatas.Instance.baseData.bindDiamond.ToString(); _sliverText.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(PlayerDatas.Instance.baseData.allCopper); } else { System/Store/StoreModel.cs
@@ -430,7 +430,7 @@ var data = datas[i]; if (!mysteryCommondities.Contains(data.storeConfig.ID)) { mysteryCommondities.RemoveAt(i); datas.RemoveAt(i); } } break; System/Strengthening/GemLevelUpWin.cs
@@ -86,7 +86,7 @@ { if (model.levelUpType == 0) { if (PlayerDatas.Instance.baseData.Gold < gemUpCost) if (PlayerDatas.Instance.baseData.diamond < gemUpCost) { if (VersionConfig.Get().isBanShu) { @@ -378,7 +378,7 @@ _gemLevelUpNextIcon.gameObject.SetActive(true); m_NextGemProperty.SetActive(true); gemUpCost = model.GemLevelUpCost(config.EffectValueB1, model.GetSingleGemPrice(config.EffectValueA1)); if (PlayerDatas.Instance.baseData.Gold < gemUpCost) if (PlayerDatas.Instance.baseData.diamond < gemUpCost) { _gemLevelUpCost.text = UIHelper.AppendStringColor(TextColType.Red, gemUpCost.ToString(), true); } System/Strengthening/StrengtheningSripts.cs
@@ -169,7 +169,7 @@ IsGuide = NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 10; _effects = true; _open = true; _money = PlayerDatas.Instance.baseData.allSliver; _money = PlayerDatas.Instance.baseData.allCopper; StrengthenModel.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息 PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshMoney;//金钱的刷新 Initialize(); @@ -1058,7 +1058,7 @@ switch (_tCDBPlayerRefresh) { case PlayerDataRefresh.Silver: _money = PlayerDatas.Instance.baseData.allSliver; _money = PlayerDatas.Instance.baseData.allCopper; _moneyText.text = MoneyContrast(_money); m_Money_text.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3)); break; System/Strengthening/WashTips.cs
@@ -357,7 +357,7 @@ private void UpdateMustWashCostMoney() { int goldCount = (int)PlayerDatas.Instance.baseData.Gold; int goldCount = (int)PlayerDatas.Instance.baseData.diamond; int costMoney = GetCostMoney(); if (goldCount >= costMoney) { @@ -612,7 +612,7 @@ if (_washProModel.isPutOn) { int costMoney = GetCostMoney(); int goldCount = (int)PlayerDatas.Instance.baseData.Gold; int goldCount = (int)PlayerDatas.Instance.baseData.diamond; int mustAddNum = GetMustAddNum(); if (equipWashModel.IsEnoughMat(_tagWashModel.washConfig)) { @@ -674,7 +674,7 @@ private bool IsMoneyEnough() { int costMoney = GetCostMoney(); int goldCount = (int)PlayerDatas.Instance.baseData.Gold; int goldCount = (int)PlayerDatas.Instance.baseData.diamond; if(goldCount < costMoney) { WindowCenter.Instance.Open<RechargeTipWin>(); System/SystemSetting/SetPrivateModel.cs
@@ -528,7 +528,7 @@ case DailyQuestType.FairyFeast: case DailyQuestType.FairyTask: var _dailyConfig = DailyQuestConfig.Get(_dailyQuestId); return PlayerDatas.Instance.baseData.Family > 0 && return PlayerDatas.Instance.baseData.FamilyId > 0 && (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID)); case DailyQuestType.RuneTowerSweep: return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0; System/Team/TeamDungeonTicketLackWin.cs
@@ -172,8 +172,8 @@ if (own < lackItem.count) { var moneyNeed = GetUnitPrice(lackType) * (lackItem.count - own); if (PlayerDatas.Instance.baseData.Gold < moneyNeed && PlayerDatas.Instance.baseData.GoldPaper < moneyNeed) if (PlayerDatas.Instance.baseData.diamond < moneyNeed && PlayerDatas.Instance.baseData.bindDiamond < moneyNeed) { if (VersionConfig.Get().isBanShu) { @@ -184,7 +184,7 @@ } else { var moneyType = PlayerDatas.Instance.baseData.GoldPaper < moneyNeed ? 1 : 2; var moneyType = PlayerDatas.Instance.baseData.bindDiamond < moneyNeed ? 1 : 2; ConfirmTodo(lackType, moneyType); } } System/Vip/OSTimeLimitGiftWin.cs
@@ -133,7 +133,7 @@ private void DisplayMoney() { m_MoneyValue.text = PlayerDatas.Instance.baseData.Gold.ToString(); m_MoneyValue.text = PlayerDatas.Instance.baseData.diamond.ToString(); } private void PlayerDataRefreshInfoEvent(PlayerDataRefresh type) System/Vip/RechargeWin.cs
@@ -110,8 +110,8 @@ void UpdateGoldValue() { m_GoldValue.text = UIHelper.ReplaceLargeNum(PlayerDatas.Instance.baseData.Gold); m_GoldPaperValue.text = UIHelper.ReplaceLargeNum(PlayerDatas.Instance.baseData.GoldPaper); m_GoldValue.text = UIHelper.ReplaceLargeNum(PlayerDatas.Instance.baseData.diamond); m_GoldPaperValue.text = UIHelper.ReplaceLargeNum(PlayerDatas.Instance.baseData.bindDiamond); } private void RechargeCountEvent(int _id) System/Vip/VipModel.cs
@@ -657,7 +657,7 @@ return; } VipGiftData data = GetVipGift(vipLv); if (PlayerDatas.Instance.baseData.Gold < data.giftNowPrice) if (PlayerDatas.Instance.baseData.diamond < data.giftNowPrice) { if (VersionConfig.Get().isBanShu) { @@ -1056,7 +1056,7 @@ { continue; } if (PlayerDatas.Instance.baseData.Gold >= data.giftNowPrice) if (PlayerDatas.Instance.baseData.diamond >= data.giftNowPrice) { giftRedpoints[i - 1].state = RedPointState.Simple; break; @@ -1099,7 +1099,7 @@ { VipGiftData data = GetVipGift(i); if (data != null && PlayerDatas.Instance.baseData.VIPLv >= i && !data.hasBuy && PlayerDatas.Instance.baseData.Gold >= data.giftNowPrice) !data.hasBuy && PlayerDatas.Instance.baseData.diamond >= data.giftNowPrice) { return i; } System/Vip/VipWin.cs
@@ -302,7 +302,7 @@ void RefreshJadeData() { m_Jade.text = PlayerDatas.Instance.baseData.Gold.ToString(); m_Jade.text = PlayerDatas.Instance.baseData.diamond.ToString(); } private void OnBuyGift() System/Welfare/PrayerModel.cs
@@ -141,7 +141,7 @@ SysNotifyMgr.Instance.ShowTip("PrayerWin_2"); return; } if (PlayerDatas.Instance.baseData.Gold < GetCoinPrayerCost()) if (PlayerDatas.Instance.baseData.diamond < GetCoinPrayerCost()) { if (VersionConfig.Get().isBanShu) { @@ -214,7 +214,7 @@ SysNotifyMgr.Instance.ShowTip("PrayerWin_2"); return; } if (PlayerDatas.Instance.baseData.Gold < GetExpPrayerCost()) if (PlayerDatas.Instance.baseData.diamond < GetExpPrayerCost()) { if (VersionConfig.Get().isBanShu) { System/Welfare/SignInItemBehaviour.cs
@@ -87,7 +87,7 @@ { if (isOk) { if (PlayerDatas.Instance.baseData.Gold >= model.keepSignInCost) if (PlayerDatas.Instance.baseData.diamond >= model.keepSignInCost) { CA509_tagCMDaySign pak = new CA509_tagCMDaySign(); pak.Day = 1; Utility/UIHelper.cs
@@ -839,15 +839,15 @@ { case 1: { return PlayerDatas.Instance.baseData.Gold; return PlayerDatas.Instance.baseData.diamond; } case 2: { return PlayerDatas.Instance.baseData.GoldPaper; return PlayerDatas.Instance.baseData.bindDiamond; } case 3: { return PlayerDatas.Instance.baseData.allSliver; return PlayerDatas.Instance.baseData.allCopper; } case 18: {
