From cb0d3169ed35fea4716f55ca6596ca88fb6884f0 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 26 十二月 2025 15:56:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Equip/EquipModel.cs | 21
Main/Config/Configs/TravelSceneryConfig.cs | 44 +
Main/Config/Configs/TravelSceneryConfig.cs.meta | 11
Main/System/BeautyMM/BeautyMMBaseWin.cs | 26
Main/System/InternalAffairs/AffairFuncCell.cs | 4
Main/Config/PartialConfigs/BeautySkinConfig.cs | 34
Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB415_tagCSMainDropItemOP.cs | 8
Main/System/BoneField/AdsManager.cs | 1
Main/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event/DTCB040_tagSCTravelInfo.cs | 8
Main/System/BeautyMM/BeautyMMShowWin.cs | 443 ++++++++++
Main/System/Redpoint/MainRedDot.cs | 3
Main/System/BeautyMM/BeautyMMManager.Travel.cs.meta | 11
Main/System/BeautyMM/BeautyMMTravelWin.cs.meta | 11
Main/Config/Configs/BeautySkinConfig.cs.meta | 11
Main/System/BeautyMM/BeautyMMCell.cs | 113 ++
Main/System/BeautyMM/BeautyMMLineCell.cs | 29
Main/Config/PartialConfigs/PlayerPropertyConfig.cs | 1
Main/Config/PartialConfigs/BeautyQualityLVConfig.cs | 47 +
Main/Main.cs | 1
Main/Config/Configs/BeautyQualityLVConfig.cs.meta | 11
Main/Config/PartialConfigs/BeautySkinConfig.cs.meta | 11
Main/Config/Configs/BeautyQualityLVConfig.cs | 80 +
Main/Config/Configs/BeautySkinConfig.cs | 110 ++
Main/System/KnapSack/PackManager.cs | 5
Main/Utility/EnumHelper.cs | 1
Main/Config/Configs/TravelEventConfig.cs | 47 +
Main/System/BeautyMM/BeautyMMTravelCell.cs.meta | 11
Main/Config/PartialConfigs/BeautyQualityLVConfig.cs.meta | 11
Main/System/BeautyMM/BeautyMMBaseWin.cs.meta | 11
Main/System/BeautyMM/BeautyMMShowWin.cs.meta | 11
Main/Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB130_tagSCBeautyInfo.cs | 7
Main/System/BeautyMM/BeautyMMManager.cs | 555 +++++++++++++
Main/System/BeautyMM/BeautyMMTravelCell.cs | 148 +++
Main/System/Arena/ArenaManager.cs | 2
Main/System/BeautyMM/BeautyMMCell.cs.meta | 11
Main/System/BeautyMM/BeautyMMTravelWin.cs | 202 ++++
Main/Config/Configs/BeautyConfig.cs.meta | 11
Main/System/BeautyMM/BeautyMMManager.Travel.cs | 147 +++
Main/System/BeautyMM/BeautyMMListWin.cs.meta | 11
Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs | 2
Main/System/BeautyMM.meta | 8
Main/Config/Configs/TravelEventConfig.cs.meta | 11
Main/System/BeautyMM/BeautyMMLineCell.cs.meta | 11
Main/System/BeautyMM/BeautyMMListWin.cs | 101 ++
Main/Config/Configs/BeautyConfig.cs | 116 ++
Main/System/BeautyMM/BeautyMMManager.cs.meta | 11
46 files changed, 2,476 insertions(+), 14 deletions(-)
diff --git a/Main/Config/Configs/BeautyConfig.cs b/Main/Config/Configs/BeautyConfig.cs
new file mode 100644
index 0000000..949e95d
--- /dev/null
+++ b/Main/Config/Configs/BeautyConfig.cs
@@ -0,0 +1,116 @@
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2025骞�12鏈�23鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class BeautyConfig : ConfigBase<int, BeautyConfig>
+{
+ static BeautyConfig()
+ {
+ // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
+ visit = true;
+ }
+
+ public int BeautyID;
+ public string Name;
+ public int BeautyQuality;
+ public int UnlockWay;
+ public int UnlockValue;
+ public int UnlockNeedCnt;
+ public int ExclusiveItemID;
+ public int[] TalentAttrIDList;
+ public int[] TalentAttrValueList;
+ public int[] TalentPerLVAddList;
+ public int EffType;
+ public int EffTypeValue;
+ public int EffValue;
+ public int EffPerLVAdd;
+ public string Desc;
+
+ public override int LoadKey(string _key)
+ {
+ int key = GetKey(_key);
+ return key;
+ }
+
+ public override void LoadConfig(string input)
+ {
+ try {
+ string[] tables = input.Split('\t');
+ int.TryParse(tables[0],out BeautyID);
+
+ Name = tables[1];
+
+ int.TryParse(tables[2],out BeautyQuality);
+
+ int.TryParse(tables[3],out UnlockWay);
+
+ int.TryParse(tables[4],out UnlockValue);
+
+ int.TryParse(tables[5],out UnlockNeedCnt);
+
+ int.TryParse(tables[6],out ExclusiveItemID);
+
+ if (tables[7].Contains("["))
+ {
+ TalentAttrIDList = JsonMapper.ToObject<int[]>(tables[7]);
+ }
+ else
+ {
+ string[] TalentAttrIDListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ TalentAttrIDList = new int[TalentAttrIDListStringArray.Length];
+ for (int i=0;i<TalentAttrIDListStringArray.Length;i++)
+ {
+ int.TryParse(TalentAttrIDListStringArray[i],out TalentAttrIDList[i]);
+ }
+ }
+
+ if (tables[8].Contains("["))
+ {
+ TalentAttrValueList = JsonMapper.ToObject<int[]>(tables[8]);
+ }
+ else
+ {
+ string[] TalentAttrValueListStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ TalentAttrValueList = new int[TalentAttrValueListStringArray.Length];
+ for (int i=0;i<TalentAttrValueListStringArray.Length;i++)
+ {
+ int.TryParse(TalentAttrValueListStringArray[i],out TalentAttrValueList[i]);
+ }
+ }
+
+ if (tables[9].Contains("["))
+ {
+ TalentPerLVAddList = JsonMapper.ToObject<int[]>(tables[9]);
+ }
+ else
+ {
+ string[] TalentPerLVAddListStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ TalentPerLVAddList = new int[TalentPerLVAddListStringArray.Length];
+ for (int i=0;i<TalentPerLVAddListStringArray.Length;i++)
+ {
+ int.TryParse(TalentPerLVAddListStringArray[i],out TalentPerLVAddList[i]);
+ }
+ }
+
+ int.TryParse(tables[10],out EffType);
+
+ int.TryParse(tables[11],out EffTypeValue);
+
+ int.TryParse(tables[12],out EffValue);
+
+ int.TryParse(tables[13],out EffPerLVAdd);
+
+ Desc = tables[14];
+ }
+ catch (Exception exception)
+ {
+ Debug.LogError(exception);
+ }
+ }
+}
diff --git a/Main/Config/Configs/BeautyConfig.cs.meta b/Main/Config/Configs/BeautyConfig.cs.meta
new file mode 100644
index 0000000..c7f468c
--- /dev/null
+++ b/Main/Config/Configs/BeautyConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 646fb0599edaa1546b6617bf5d7cc6e2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/Configs/BeautyQualityLVConfig.cs b/Main/Config/Configs/BeautyQualityLVConfig.cs
new file mode 100644
index 0000000..e928974
--- /dev/null
+++ b/Main/Config/Configs/BeautyQualityLVConfig.cs
@@ -0,0 +1,80 @@
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2025骞�12鏈�21鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class BeautyQualityLVConfig : ConfigBase<int, BeautyQualityLVConfig>
+{
+ static BeautyQualityLVConfig()
+ {
+ // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
+ visit = true;
+ }
+
+ public int ID;
+ public int BeautyQuality;
+ public int BeautyLV;
+ public int LVNeedExp;
+ public int[] AttrIDList;
+ public int[] AttrValueList;
+ public int[][] AwardItemList;
+
+ public override int LoadKey(string _key)
+ {
+ int key = GetKey(_key);
+ return key;
+ }
+
+ public override void LoadConfig(string input)
+ {
+ try {
+ string[] tables = input.Split('\t');
+ int.TryParse(tables[0],out ID);
+
+ int.TryParse(tables[1],out BeautyQuality);
+
+ int.TryParse(tables[2],out BeautyLV);
+
+ int.TryParse(tables[3],out LVNeedExp);
+
+ if (tables[4].Contains("["))
+ {
+ AttrIDList = JsonMapper.ToObject<int[]>(tables[4]);
+ }
+ else
+ {
+ string[] AttrIDListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrIDList = new int[AttrIDListStringArray.Length];
+ for (int i=0;i<AttrIDListStringArray.Length;i++)
+ {
+ int.TryParse(AttrIDListStringArray[i],out AttrIDList[i]);
+ }
+ }
+
+ if (tables[5].Contains("["))
+ {
+ AttrValueList = JsonMapper.ToObject<int[]>(tables[5]);
+ }
+ else
+ {
+ string[] AttrValueListStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrValueList = new int[AttrValueListStringArray.Length];
+ for (int i=0;i<AttrValueListStringArray.Length;i++)
+ {
+ int.TryParse(AttrValueListStringArray[i],out AttrValueList[i]);
+ }
+ }
+
+ AwardItemList = JsonMapper.ToObject<int[][]>(tables[6].Replace("(", "[").Replace(")", "]"));
+ }
+ catch (Exception exception)
+ {
+ Debug.LogError(exception);
+ }
+ }
+}
diff --git a/Main/Config/Configs/BeautyQualityLVConfig.cs.meta b/Main/Config/Configs/BeautyQualityLVConfig.cs.meta
new file mode 100644
index 0000000..a2f070b
--- /dev/null
+++ b/Main/Config/Configs/BeautyQualityLVConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cd6551a3725246a41b7ee227f77a56db
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/Configs/BeautySkinConfig.cs b/Main/Config/Configs/BeautySkinConfig.cs
new file mode 100644
index 0000000..3407cc1
--- /dev/null
+++ b/Main/Config/Configs/BeautySkinConfig.cs
@@ -0,0 +1,110 @@
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2025骞�12鏈�21鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class BeautySkinConfig : ConfigBase<int, BeautySkinConfig>
+{
+ static BeautySkinConfig()
+ {
+ // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
+ visit = true;
+ }
+
+ public int SkinID;
+ public int BeautyID;
+ public int UnlockWay;
+ public int UnlockValue;
+ public int UnlockNeedCnt;
+ public int UpNeedCnt;
+ public int StarMax;
+ public int[] AttrIDList;
+ public int[] InitAttrValueList;
+ public int[] AttrPerStarAddList;
+ public string HeadIcon;
+ public string SmallRole;
+ public string BigRole;
+
+ public override int LoadKey(string _key)
+ {
+ int key = GetKey(_key);
+ return key;
+ }
+
+ public override void LoadConfig(string input)
+ {
+ try {
+ string[] tables = input.Split('\t');
+ int.TryParse(tables[0],out SkinID);
+
+ int.TryParse(tables[1],out BeautyID);
+
+ int.TryParse(tables[2],out UnlockWay);
+
+ int.TryParse(tables[3],out UnlockValue);
+
+ int.TryParse(tables[4],out UnlockNeedCnt);
+
+ int.TryParse(tables[5],out UpNeedCnt);
+
+ int.TryParse(tables[6],out StarMax);
+
+ if (tables[7].Contains("["))
+ {
+ AttrIDList = JsonMapper.ToObject<int[]>(tables[7]);
+ }
+ else
+ {
+ string[] AttrIDListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrIDList = new int[AttrIDListStringArray.Length];
+ for (int i=0;i<AttrIDListStringArray.Length;i++)
+ {
+ int.TryParse(AttrIDListStringArray[i],out AttrIDList[i]);
+ }
+ }
+
+ if (tables[8].Contains("["))
+ {
+ InitAttrValueList = JsonMapper.ToObject<int[]>(tables[8]);
+ }
+ else
+ {
+ string[] InitAttrValueListStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ InitAttrValueList = new int[InitAttrValueListStringArray.Length];
+ for (int i=0;i<InitAttrValueListStringArray.Length;i++)
+ {
+ int.TryParse(InitAttrValueListStringArray[i],out InitAttrValueList[i]);
+ }
+ }
+
+ if (tables[9].Contains("["))
+ {
+ AttrPerStarAddList = JsonMapper.ToObject<int[]>(tables[9]);
+ }
+ else
+ {
+ string[] AttrPerStarAddListStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrPerStarAddList = new int[AttrPerStarAddListStringArray.Length];
+ for (int i=0;i<AttrPerStarAddListStringArray.Length;i++)
+ {
+ int.TryParse(AttrPerStarAddListStringArray[i],out AttrPerStarAddList[i]);
+ }
+ }
+
+ HeadIcon = tables[10];
+
+ SmallRole = tables[11];
+
+ BigRole = tables[12];
+ }
+ catch (Exception exception)
+ {
+ Debug.LogError(exception);
+ }
+ }
+}
diff --git a/Main/Config/Configs/BeautySkinConfig.cs.meta b/Main/Config/Configs/BeautySkinConfig.cs.meta
new file mode 100644
index 0000000..bfcb994
--- /dev/null
+++ b/Main/Config/Configs/BeautySkinConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9725e78e336a4fd43a27a4530f95e85d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/Configs/TravelEventConfig.cs b/Main/Config/Configs/TravelEventConfig.cs
new file mode 100644
index 0000000..db706b9
--- /dev/null
+++ b/Main/Config/Configs/TravelEventConfig.cs
@@ -0,0 +1,47 @@
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2025骞�12鏈�21鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class TravelEventConfig : ConfigBase<int, TravelEventConfig>
+{
+ static TravelEventConfig()
+ {
+ // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
+ visit = true;
+ }
+
+ public int EventID;
+ public int AwardItemID;
+ public int AwardItemCnt;
+ public string ShowRate;
+
+ public override int LoadKey(string _key)
+ {
+ int key = GetKey(_key);
+ return key;
+ }
+
+ public override void LoadConfig(string input)
+ {
+ try {
+ string[] tables = input.Split('\t');
+ int.TryParse(tables[0],out EventID);
+
+ int.TryParse(tables[1],out AwardItemID);
+
+ int.TryParse(tables[2],out AwardItemCnt);
+
+ ShowRate = tables[3];
+ }
+ catch (Exception exception)
+ {
+ Debug.LogError(exception);
+ }
+ }
+}
diff --git a/Main/Config/Configs/TravelEventConfig.cs.meta b/Main/Config/Configs/TravelEventConfig.cs.meta
new file mode 100644
index 0000000..e8bac1a
--- /dev/null
+++ b/Main/Config/Configs/TravelEventConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4f7be2f35c0d86c43ad82c5cac661a7b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/Configs/TravelSceneryConfig.cs b/Main/Config/Configs/TravelSceneryConfig.cs
new file mode 100644
index 0000000..944137e
--- /dev/null
+++ b/Main/Config/Configs/TravelSceneryConfig.cs
@@ -0,0 +1,44 @@
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2025骞�12鏈�21鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class TravelSceneryConfig : ConfigBase<int, TravelSceneryConfig>
+{
+ static TravelSceneryConfig()
+ {
+ // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
+ visit = true;
+ }
+
+ public int ID;
+ public int SceneryType;
+ public int AwardQuality;
+
+ public override int LoadKey(string _key)
+ {
+ int key = GetKey(_key);
+ return key;
+ }
+
+ public override void LoadConfig(string input)
+ {
+ try {
+ string[] tables = input.Split('\t');
+ int.TryParse(tables[0],out ID);
+
+ int.TryParse(tables[1],out SceneryType);
+
+ int.TryParse(tables[2],out AwardQuality);
+ }
+ catch (Exception exception)
+ {
+ Debug.LogError(exception);
+ }
+ }
+}
diff --git a/Main/Config/Configs/TravelSceneryConfig.cs.meta b/Main/Config/Configs/TravelSceneryConfig.cs.meta
new file mode 100644
index 0000000..b8b96d4
--- /dev/null
+++ b/Main/Config/Configs/TravelSceneryConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d5ef31d5d0e91bd40aa2f8a1ff715ebd
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/PartialConfigs/BeautyQualityLVConfig.cs b/Main/Config/PartialConfigs/BeautyQualityLVConfig.cs
new file mode 100644
index 0000000..708e204
--- /dev/null
+++ b/Main/Config/PartialConfigs/BeautyQualityLVConfig.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+public partial class BeautyQualityLVConfig : ConfigBase<int, BeautyQualityLVConfig>
+{
+ static Dictionary<int, Dictionary<int, BeautyQualityLVConfig>> beautyQualityLVConfigDict = new Dictionary<int, Dictionary<int, BeautyQualityLVConfig>>();
+ static Dictionary<int, int> beautyQualityMaxLVDict = new Dictionary<int, int>();
+ protected override void OnConfigParseCompleted()
+ {
+ if (!beautyQualityLVConfigDict.ContainsKey(BeautyQuality))
+ {
+ beautyQualityLVConfigDict[BeautyQuality] = new Dictionary<int, BeautyQualityLVConfig>();
+ }
+ beautyQualityLVConfigDict[BeautyQuality][BeautyLV] = this;
+
+ if (!beautyQualityMaxLVDict.ContainsKey(BeautyQuality))
+ {
+ beautyQualityMaxLVDict[BeautyQuality] = BeautyLV;
+ }
+ else
+ {
+ if (beautyQualityMaxLVDict[BeautyQuality] < BeautyLV)
+ {
+ beautyQualityMaxLVDict[BeautyQuality] = BeautyLV;
+ }
+ }
+
+ }
+
+ public static bool TryGetBeautyQualityLVConfig(int beautyQuality, int beautyLV, out BeautyQualityLVConfig config)
+ {
+ config = null;
+ if (beautyQualityLVConfigDict.TryGetValue(beautyQuality, out var beautyQualityDict) && beautyQualityDict.TryGetValue(beautyLV, out config))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public static int GetBeautyQualityMaxLV(int beautyQuality)
+ {
+ if (beautyQualityMaxLVDict.TryGetValue(beautyQuality, out var maxLV))
+ {
+ return maxLV;
+ }
+ return 0;
+ }
+
+}
diff --git a/Main/Config/PartialConfigs/BeautyQualityLVConfig.cs.meta b/Main/Config/PartialConfigs/BeautyQualityLVConfig.cs.meta
new file mode 100644
index 0000000..98d1495
--- /dev/null
+++ b/Main/Config/PartialConfigs/BeautyQualityLVConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0660a23b092ec664ebfc5f9767299a4b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/PartialConfigs/BeautySkinConfig.cs b/Main/Config/PartialConfigs/BeautySkinConfig.cs
new file mode 100644
index 0000000..89b01b8
--- /dev/null
+++ b/Main/Config/PartialConfigs/BeautySkinConfig.cs
@@ -0,0 +1,34 @@
+锘縰sing System.Collections.Generic;
+
+public partial class BeautySkinConfig : ConfigBase<int, BeautySkinConfig>
+{
+
+ private static Dictionary<int, List<BeautySkinConfig>> mmIDToSkinDict = new Dictionary<int, List<BeautySkinConfig>>();
+
+ protected override void OnConfigParseCompleted()
+ {
+ if (!mmIDToSkinDict.ContainsKey(BeautyID))
+ {
+ List<BeautySkinConfig> skinList = new List<BeautySkinConfig>();
+ skinList.Add(this);
+ mmIDToSkinDict.Add(BeautyID, skinList);
+ }
+ else
+ {
+ mmIDToSkinDict[BeautyID].Add(this);
+ }
+ }
+
+ public static List<BeautySkinConfig> GetSkinListByMMID(int mmID)
+ {
+ List<BeautySkinConfig> skinList = null;
+ mmIDToSkinDict.TryGetValue(mmID, out skinList);
+ return skinList;
+ }
+
+}
+
+
+
+
+
diff --git a/Main/Config/PartialConfigs/BeautySkinConfig.cs.meta b/Main/Config/PartialConfigs/BeautySkinConfig.cs.meta
new file mode 100644
index 0000000..aa58d3a
--- /dev/null
+++ b/Main/Config/PartialConfigs/BeautySkinConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 90057d768cacf89479f093c7d875eff4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Config/PartialConfigs/PlayerPropertyConfig.cs b/Main/Config/PartialConfigs/PlayerPropertyConfig.cs
index 401630f..add627a 100644
--- a/Main/Config/PartialConfigs/PlayerPropertyConfig.cs
+++ b/Main/Config/PartialConfigs/PlayerPropertyConfig.cs
@@ -81,6 +81,7 @@
return GetFullDescription(property.x, property.y);
}
+ // 鑾峰彇灞炴�у叏鎻忚堪锛屽寘鎷睘鎬у悕鍜屽睘鎬у�� 鍙傝�冩牸寮� string format = "{0}" + UIHelper.AppendColor(TextColType.Green, "+{1}");
public static string GetFullDescription(int id, long value, string format="{0}+{1}")
{
var config = Get(id);
diff --git a/Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB415_tagCSMainDropItemOP.cs b/Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB415_tagCSMainDropItemOP.cs
index dbb9c85..e3f308c 100644
--- a/Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB415_tagCSMainDropItemOP.cs
+++ b/Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB415_tagCSMainDropItemOP.cs
@@ -1,12 +1,12 @@
-using UnityEngine;
-using System.Collections;
-
+using UnityEngine;
+using System.Collections;
+
// B4 15 涓荤嚎鎺夎惤鐗╁搧鎿嶄綔 #tagCSMainDropItemOP
public class CB415_tagCSMainDropItemOP : GameNetPackBasic {
public byte Count;
public ushort[] IndexList; // 鎺夎惤鑳屽寘涓殑鐗╁搧鏍煎瓙绱㈠紩鍒楄〃
- public byte OPType; // 0 - 鎷惧彇闈炶澶囩墿鍝侊紱1 - 鍒嗚В锛�2 - 绌挎埓/鏇挎崲锛�
+ public byte OPType; // 0 - 鎷惧彇闈炶澶囩墿鍝侊紱1 - 鍒嗚В锛�2 - 绌挎埓/鏇挎崲锛� 3- 涓诲姩璇锋眰鎺夎惤
public byte OPValue; // 鎿嶄綔棰濆鎸囦护鍊硷紝鐢辨搷浣滅被鍨嬪喅瀹氾紝濡傜┛鎴存椂鍙彂閫佺┛鎴村悗鏄惁鑷姩鍒嗚В
public CB415_tagCSMainDropItemOP () {
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event/DTCB040_tagSCTravelInfo.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event/DTCB040_tagSCTravelInfo.cs
index 86938bb..54fad44 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event/DTCB040_tagSCTravelInfo.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event/DTCB040_tagSCTravelInfo.cs
@@ -1,11 +1,13 @@
-using UnityEngine;
-using System.Collections;
-
+using UnityEngine;
+using System.Collections;
+
// B0 40 娓稿巻淇℃伅 #tagSCTravelInfo
public class DTCB040_tagSCTravelInfo : DtcBasic {
public override void Done(GameNetPackBasic vNetPack) {
base.Done(vNetPack);
HB040_tagSCTravelInfo vNetData = vNetPack as HB040_tagSCTravelInfo;
+ BeautyMMManager.Instance.UpdateTravelInfo(vNetData);
+
}
}
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB130_tagSCBeautyInfo.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB130_tagSCBeautyInfo.cs
index e217e5f..56feb1b 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB130_tagSCBeautyInfo.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB130_tagSCBeautyInfo.cs
@@ -1,11 +1,12 @@
-using UnityEngine;
-using System.Collections;
-
+using UnityEngine;
+using System.Collections;
+
// B1 30 绾㈤淇℃伅 #tagSCBeautyInfo
public class DTCB130_tagSCBeautyInfo : DtcBasic {
public override void Done(GameNetPackBasic vNetPack) {
base.Done(vNetPack);
HB130_tagSCBeautyInfo vNetData = vNetPack as HB130_tagSCBeautyInfo;
+ BeautyMMManager.Instance.UpdateBeautyMMData(vNetData);
}
}
diff --git a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
index 4e90c99..74d0d34 100644
--- a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
+++ b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
@@ -136,6 +136,8 @@
Register(typeof(HB129_tagSCLineupRecommendInfo), typeof(DTCB129_tagSCLineupRecommendInfo));
Register(typeof(HAB05_tagSCOSACelebrationInfo), typeof(DTCAB05_tagSCOSACelebrationInfo));
Register(typeof(HB131_tagSCHeroFatesInfo), typeof(DTCB131_tagSCHeroFatesInfo));
+ Register(typeof(HB130_tagSCBeautyInfo), typeof(DTCB130_tagSCBeautyInfo));
+ Register(typeof(HB040_tagSCTravelInfo), typeof(DTCB040_tagSCTravelInfo));
}
//涓诲伐绋嬫敞鍐屽皝鍖�
diff --git a/Main/Main.cs b/Main/Main.cs
index 0874c51..bbc65ce 100644
--- a/Main/Main.cs
+++ b/Main/Main.cs
@@ -95,6 +95,7 @@
managers.Add(LineupRecommendManager.Instance);
managers.Add(OSActivityManager.Instance);
managers.Add(HeroFatesManager.Instance);
+ managers.Add(BeautyMMManager.Instance);
foreach (var manager in managers)
{
manager.Init();
diff --git a/Main/System/Arena/ArenaManager.cs b/Main/System/Arena/ArenaManager.cs
index a713e4b..d921a07 100644
--- a/Main/System/Arena/ArenaManager.cs
+++ b/Main/System/Arena/ArenaManager.cs
@@ -27,6 +27,7 @@
public Dictionary<int, int[][]> seasonRankRewards; // 璧涘鎺掕濂栧姳 {"鍚嶆":[[鐗╁搧ID, 涓暟,鏄惁鎷嶅搧], ...], ...}
public uint score; // 褰撳墠绉垎
+ public int totalWinCnt; //绱鑳滃埄娆℃暟
public List<ArenaMatchInfo> matchInfoList = new List<ArenaMatchInfo>();
//鐢ㄤ簬鐢ㄦ潵鎷挎垬鏂楄儨鍒╁け璐ョ殑澶村儚淇℃伅
@@ -155,6 +156,7 @@
if (vNetData == null)
return;
this.score = vNetData.Score;
+ totalWinCnt = (int)vNetData.WinCnt;
OnUpdateArenaPlayerInfo?.Invoke();
}
public void UpdateGameRecInfo(HA009_tagSCGameRecInfo vNetData)
diff --git a/Main/System/BeautyMM.meta b/Main/System/BeautyMM.meta
new file mode 100644
index 0000000..6f4d5b2
--- /dev/null
+++ b/Main/System/BeautyMM.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a8042b4dcd2800143ae2663d7b0c5765
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMBaseWin.cs b/Main/System/BeautyMM/BeautyMMBaseWin.cs
new file mode 100644
index 0000000..529a3e1
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMBaseWin.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BeautyMMBaseWin : OneLevelWin
+{
+
+
+ protected override void OpenSubUIByTabIndex()
+ {
+ switch (functionOrder)
+ {
+ case 0:
+ currentSubUI = UIManager.Instance.OpenWindow<BeautyMMListWin>();
+ break;
+ case 1:
+ // 鍏呭�肩晫闈�
+ currentSubUI = UIManager.Instance.OpenWindow<BeautyMMTravelWin>();
+ break;
+ default:
+ Debug.LogWarning("鏈煡鐨勬爣绛剧储寮�: " + functionOrder);
+ break;
+ }
+
+ }
+}
diff --git a/Main/System/BeautyMM/BeautyMMBaseWin.cs.meta b/Main/System/BeautyMM/BeautyMMBaseWin.cs.meta
new file mode 100644
index 0000000..3b7a291
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMBaseWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 48ac597434993c24eb71702157db3aa0
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMCell.cs b/Main/System/BeautyMM/BeautyMMCell.cs
new file mode 100644
index 0000000..4e1d5dd
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMCell.cs
@@ -0,0 +1,113 @@
+锘縰sing System;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+public class BeautyMMCell : MonoBehaviour
+{
+
+ [SerializeField] Image bgIcon;
+ [SerializeField] ImageEx roleImg;
+ [SerializeField] Text nameText;
+ [SerializeField] Transform costRect;
+ [SerializeField] Image costIcon;
+ [SerializeField] Text costText;
+ [SerializeField] Text[] talentTexts;
+ [SerializeField] Image redImg;
+ [SerializeField] Image activeImg;
+ [SerializeField] Image lvBg;
+ [SerializeField] Text lvText;
+ [SerializeField] Button mmBtn;
+ [SerializeField] Transform mask;
+
+ public void Display(int index)
+ {
+ var mmID = BeautyMMManager.Instance.beautyMMIDSortList[index];
+ var isActive = BeautyMMManager.Instance.isActiveMM(mmID);
+ var mmConfig = BeautyConfig.Get(mmID);
+ bgIcon.SetSprite($"mmBG{mmConfig.BeautyQuality}");
+ int skinID = BeautyMMManager.Instance.GetUsedSkinID(mmID);
+ var skinConfig = BeautySkinConfig.Get(skinID);
+ roleImg.SetOrgSprite(skinConfig.SmallRole, "BeautyMMSmallRole");
+ roleImg.gray = !isActive;
+ mask.SetActive(!isActive);
+ nameText.text = mmConfig.Name;
+ if (!isActive)
+ {
+ costRect.SetActive(mmConfig.UnlockWay == 1);
+ costIcon.SetItemSprite(mmConfig.UnlockValue);
+ var cnt = PackManager.Instance.GetItemCountByID(PackType.Item, mmConfig.UnlockValue);
+ costText.text = $"{cnt}/{mmConfig.UnlockNeedCnt}";
+ costText.color = cnt >= mmConfig.UnlockNeedCnt ? Color.green : Color.red;
+ }
+ else
+ {
+ costRect.SetActive(false);
+ }
+
+ //鍏堟樉绀哄ぉ璧嬪睘鎬э紝鍐嶆樉绀哄ぉ璧嬬壒鎬�
+ var attrs = BeautyMMManager.Instance.GetMMTalentAttrForUI(mmID, true);
+ int talentIndex = 0;
+ if (attrs.IsNullOrEmpty())
+ {
+ talentIndex = 0;
+ }
+ else
+ {
+ foreach (var attr in attrs)
+ {
+ if (talentIndex < talentTexts.Length)
+ {
+ talentTexts[talentIndex].SetActive(true);
+ talentTexts[talentIndex].text = PlayerPropertyConfig.GetFullDescription(attr.Key, attr.Value);
+ }
+ else
+ {
+ break;
+ }
+ talentIndex++;
+ }
+ }
+
+
+
+ for (int i = talentIndex; i < talentTexts.Length; i++)
+ {
+ if (i == talentIndex && mmConfig.EffType != 0)
+ {
+ //澶╄祴鏁堟灉绾﹀畾鏈�澶氫竴涓�
+ talentTexts[talentIndex].SetActive(true);
+ talentTexts[i].text = Language.Get($"BeautyMMTalentDefault{mmConfig.EffType}");
+ }
+ else
+ {
+ talentTexts[i].SetActive(false);
+ }
+ }
+
+
+
+ redImg.SetActive(BeautyMMManager.Instance.IsMMRed(mmID));
+ activeImg.SetActive(BeautyMMManager.Instance.GetMMBaseState(mmConfig) > 1);
+
+ var mmData = BeautyMMManager.Instance.GetBeautyMMData(mmID);
+ if (mmData != null)
+ {
+ lvText.text = mmData.LV.ToString();
+ lvBg.SetActive(mmData.LV > 0);
+ }
+ else
+ {
+ lvBg.SetActive(false);
+ }
+
+ mmBtn.AddListener(() =>
+ {
+ UIManager.Instance.OpenWindow<BeautyMMShowWin>(mmID);
+ });
+ }
+
+}
+
+
diff --git a/Main/System/BeautyMM/BeautyMMCell.cs.meta b/Main/System/BeautyMM/BeautyMMCell.cs.meta
new file mode 100644
index 0000000..c3b1d21
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMCell.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 14d2e2937f1af8e41a99e3aa09ea85a5
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMLineCell.cs b/Main/System/BeautyMM/BeautyMMLineCell.cs
new file mode 100644
index 0000000..803f1bd
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMLineCell.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+public class BeautyMMLineCell : CellView
+{
+ [SerializeField] BeautyMMCell[] mmCells;
+ public void Display(int index)
+ {
+ for (int i = 0; i < mmCells.Length; i++)
+ {
+ if (index + i < BeautyMMManager.Instance.beautyMMIDSortList.Count)
+ {
+ mmCells[i].SetActive(true);
+ mmCells[i].Display(index + i);
+ }
+ else
+ {
+ mmCells[i].SetActive(false);
+ }
+ }
+ }
+
+
+}
+
+
diff --git a/Main/System/BeautyMM/BeautyMMLineCell.cs.meta b/Main/System/BeautyMM/BeautyMMLineCell.cs.meta
new file mode 100644
index 0000000..3500922
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMLineCell.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20109e4945479c3438f8b35aad598423
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMListWin.cs b/Main/System/BeautyMM/BeautyMMListWin.cs
new file mode 100644
index 0000000..0820869
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMListWin.cs
@@ -0,0 +1,101 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BeautyMMListWin : UIBase
+{
+ [SerializeField] Button seeAttrBtn;
+ [SerializeField] ScrollerController scroller;
+ [SerializeField] GroupButtonEx allMMBtn;
+ [SerializeField] GroupButtonEx knownMMBtn;
+ [SerializeField] GroupButtonEx unknownMMBtn;
+
+ protected override void InitComponent()
+ {
+ seeAttrBtn.AddListener(() =>
+ {
+ // UIManager.Instance.OpenWindow<BeautyMMAttrWin>();
+ });
+ allMMBtn.AddListener(() =>
+ {
+ functionOrder = 0;
+ BeautyMMManager.Instance.SortMMList(functionOrder);
+ CreateScroller();
+ });
+ knownMMBtn.AddListener(() =>
+ {
+ functionOrder = 1;
+ BeautyMMManager.Instance.SortMMList(functionOrder);
+ CreateScroller();
+ });
+ unknownMMBtn.AddListener(() =>
+ {
+ functionOrder = 2;
+ BeautyMMManager.Instance.SortMMList(functionOrder);
+ CreateScroller();
+ });
+ }
+
+
+ protected override void OnPreOpen()
+ {
+ BeautyMMManager.Instance.SortMMList(functionOrder);
+ scroller.OnRefreshCell += OnRefreshCell;
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
+ Display();
+ }
+
+
+ protected override void OnPreClose()
+ {
+ scroller.OnRefreshCell -= OnRefreshCell;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+ }
+
+ void CreateScroller()
+ {
+ scroller.Refresh();
+ for (int i = 0; i < BeautyMMManager.Instance.beautyMMIDSortList.Count; i++)
+ {
+ if (i % 3 == 0)
+ {
+ scroller.AddCell(ScrollerDataType.Header, i);
+ }
+ }
+ scroller.Restart();
+ }
+
+
+ void OnRefreshCell(ScrollerDataType type, CellView cell)
+ {
+ var _cell = cell as BeautyMMLineCell;
+ _cell.Display(cell.index);
+ }
+
+
+ void Display()
+ {
+ switch (functionOrder)
+ {
+ case 0:
+ allMMBtn.SelectBtn(true);
+ break;
+ case 1:
+ knownMMBtn.SelectBtn(true);
+ break;
+ case 2:
+ unknownMMBtn.SelectBtn(true);
+ break;
+ }
+ CreateScroller();
+ }
+
+ void OnCloseWindow(UIBase ui)
+ {
+ if (ui is BeautyMMShowWin)
+ {
+ scroller.m_Scorller.RefreshActiveCellViews();
+ }
+ }
+
+}
diff --git a/Main/System/BeautyMM/BeautyMMListWin.cs.meta b/Main/System/BeautyMM/BeautyMMListWin.cs.meta
new file mode 100644
index 0000000..a842213
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMListWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 05c8f6d48338973479402594fb503785
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMManager.Travel.cs b/Main/System/BeautyMM/BeautyMMManager.Travel.cs
new file mode 100644
index 0000000..6fdcb20
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMManager.Travel.cs
@@ -0,0 +1,147 @@
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+using System.Linq;
+using LitJson;
+
+
+public partial class BeautyMMManager : GameSystemManager<BeautyMMManager>
+{
+ public byte m_Energy; //鍓╀綑浣撳姏
+ public uint m_EnergyTime; //涓婃鎭㈠浣撳姏鏃堕棿鎴�
+ public uint m_TravelCnt; //绱娓稿巻娆℃暟
+ public byte m_SceneryType; //鏅绫诲瀷
+ public byte m_SceneryRow; //鏅宸︿笂瑙掓墍鍦ㄨ锛屼粠1寮�濮�
+ public byte m_SceneryCol; //鏅宸︿笂瑙掓墍鍦ㄥ垪锛屼粠1寮�濮�
+ public uint m_SceneryLVInfo; //鏅鍗囩骇淇℃伅锛�0-杩樻湭澶勭悊鏅鍗囩骇锛涗釜浣嶆暟-绗�1娆″崌绾ф垚鍔熶笌鍚︼紝1-鎴愬姛锛�2-澶辫触锛涘崄浣�-绗�2娆� ...
+ public byte m_Result; //鍚庣澶勭悊锛�0-鏃狅紱1-甯歌锛�2-椹溅鐐稿脊锛�3-浼犻�侀棬锛�4-鏅锛�5-閲嶇疆寮�濮嬶紱锛侊紒锛侀噸鐧讳細鍙樻垚0锛屽彧鍋氬嵆鏃跺垽鏂敤
+
+ Dictionary<Int2, TravelGrid> m_GridDict = new Dictionary<Int2, TravelGrid>();
+ public List<Int2> openChangeGridList = new List<Int2>(); // 鍓嶅悗瀵规瘮锛屾湁鍙樺寲鐨勬牸瀛� ,鎵撳紑鍓嶉潰鍓嶉渶娓呯悊
+ public event Action<int> OnTravelInfoUpdate;
+
+ public int maxGirds = 0;
+ public Int2 clickGirdPos = new Int2();
+
+ public void UpdateTravelInfo(HB040_tagSCTravelInfo netPack)
+ {
+ m_Energy = netPack.Energy;
+ m_EnergyTime = netPack.EnergyTime;
+ m_TravelCnt = netPack.TravelCnt;
+ m_SceneryType = netPack.SceneryType;
+ m_SceneryRow = netPack.SceneryRow;
+ m_SceneryCol = netPack.SceneryCol;
+ m_SceneryLVInfo = netPack.SceneryLVInfo;
+ m_Result = netPack.Result;
+ openChangeGridList.Clear();
+
+ for (int i = 0; i < netPack.GridCnt; i++)
+ {
+ var grid = netPack.GridList[i];
+ var key = new Int2(grid.Row, grid.Col);
+ if (m_GridDict.ContainsKey(key))
+ {
+ if (m_GridDict[key].State != grid.State)
+ {
+ openChangeGridList.Add(key);
+ }
+ m_GridDict[key].State = grid.State;
+ m_GridDict[key].Multi = grid.Multi;
+ m_GridDict[key].EventID = grid.EventID;
+ }
+ else
+ {
+ if (grid.State != 0)
+ {
+ openChangeGridList.Add(key);
+ }
+ m_GridDict.Add(key, new TravelGrid() { State = grid.State, Multi = grid.Multi, EventID = grid.EventID });
+ }
+ }
+ OnTravelInfoUpdate?.Invoke(m_Result);
+ UpdateTravelRedpoint();
+ }
+
+ //index浠�0寮�濮嬶紝杞牸瀛愬潗鏍囷紙1,1锛夊紑濮�
+ public Int2 ChangeIndexToGrid(int index)
+ {
+ int row = index / travelRowCol[1] + 1;
+ int col = index % travelRowCol[1] + 1;
+ return new Int2(row, col);
+ }
+
+ public TravelGrid GetGrid(Int2 gridPos)
+ {
+ if (m_GridDict.ContainsKey(gridPos))
+ {
+ return m_GridDict[gridPos];
+ }
+ return null;
+ }
+
+ public bool CanOpenBuild()
+ {
+ if (m_SceneryType == 0)
+ {
+ return false;
+ }
+ //鍒ゆ柇寤虹瓚鏍煎瓙鏄惁鍏ㄥ紑锛岃绠楁暟閲�
+ int cnt = 0;
+ foreach (var grid in m_GridDict)
+ {
+ if (grid.Value.State == 1 && grid.Value.EventID > 0 && grid.Value.EventID < (int)GirdEventType.Door)
+ {
+ cnt++;
+ }
+ }
+ return cnt >= m_SceneryType;
+ }
+
+ public bool HasDoor()
+ {
+ if (m_SceneryType == 0)
+ {
+ return false;
+ }
+ foreach (var grid in m_GridDict)
+ {
+ if (grid.Value.EventID == (int)GirdEventType.Door)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ Redpoint redpointTravel = new Redpoint(MainRedDot.Redpoint_BeautyMM, MainRedDot.Redpoint_BeautyMM * 10 + 2);
+ void UpdateTravelRedpoint()
+ {
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BeautyMM))
+ {
+ return;
+ }
+ redpointTravel.state = m_Energy > 0 ? RedPointState.Simple : RedPointState.None;
+ }
+
+
+}
+
+
+public class TravelGrid
+{
+ public byte State; //鐘舵�侊細0-鏈偣鍑伙紱1-宸插紑鍚紱2-瑁傜汗
+ public byte Multi; //濂栧姳鍊嶅�硷細 榛樿1鍊嶏紱2-鍙屽�嶏紱...
+ public ushort EventID; //浜嬩欢ID
+}
+
+//浣庝簬99鐨勪负寤虹瓚鏍煎瓙 澶т簬200鐨勪负鐗╁搧鏍煎瓙
+public enum GirdEventType
+{
+ None = 0,
+ Door = 99, // 闂�
+ Empty = 100, // 绌烘牸瀛�
+ Horse = 101, // 椹尮
+}
+
diff --git a/Main/System/BeautyMM/BeautyMMManager.Travel.cs.meta b/Main/System/BeautyMM/BeautyMMManager.Travel.cs.meta
new file mode 100644
index 0000000..823509a
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMManager.Travel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a952f6ec1e792504886a22be9d63bd63
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs b/Main/System/BeautyMM/BeautyMMManager.cs
new file mode 100644
index 0000000..fb64125
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMManager.cs
@@ -0,0 +1,555 @@
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+using System.Linq;
+using LitJson;
+
+
+public partial class BeautyMMManager : GameSystemManager<BeautyMMManager>
+{
+
+ public List<int> beautyMMIDSortList = new List<int>();
+ public Dictionary<int, BeautyMMData> beautyMMDataDict = new Dictionary<int, BeautyMMData>(); //MMID 瀵瑰簲 鏁版嵁
+ public Dictionary<int, BeautyMMSkinData> beautyMMSkinDataDict = new Dictionary<int, BeautyMMSkinData>(); //鐨偆ID 瀵瑰簲 鏁版嵁
+ public event Action OnBeautyMMDataUpdate;
+
+ public int selectLoveItemID = 0;
+
+ //閰嶇疆
+
+ //閬撳叿ID 瀵瑰簲 濂芥劅搴�
+ public Dictionary<int, int> giftIDToLoveDict = new Dictionary<int, int>();
+ public int[] loveItemIDs;
+ public int specialGiftLove = 0; // 鏁板��3锛氫笓灞炰俊鐗╅亾鍏峰ソ鎰熷害
+ public int needLVForTalent = 0; // 鏁板��4锛氭瘡x绾уソ鎰熷害鎻愬崌涓�绾уぉ璧嬫晥鏋�
+ public int baseTravelEnergy = 0; // 鏁板��1锛氬熀纭�浣撳姏涓婇檺
+ public int recoverTravelEnergyTime = 0; // 鏁板��2锛氭仮澶�1鐐逛綋鍔涙墍闇�鏃堕棿锛屽垎閽�
+ public int[] travelRowCol = new int[2]; // 鏁板��3锛氭父鍘嗚鍒楁暟 琛寍鍒�
+
+ public override void Init()
+ {
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitialize;
+ ParseConfig();
+ }
+
+ public override void Release()
+ {
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitialize;
+ }
+
+ void OnBeforePlayerDataInitialize()
+ {
+ beautyMMIDSortList.Clear();
+ beautyMMDataDict.Clear();
+ beautyMMSkinDataDict.Clear();
+ m_GridDict.Clear();
+ }
+
+ void ParseConfig()
+ {
+ var config = FuncConfigConfig.Get("BeautyLVUP");
+ loveItemIDs = JsonMapper.ToObject<int[]>(config.Numerical1);
+ var _list2 = JsonMapper.ToObject<int[]>(config.Numerical2);
+ for (int i = 0; i < loveItemIDs.Length; i++)
+ {
+ giftIDToLoveDict[loveItemIDs[i]] = _list2[i];
+ }
+ specialGiftLove = int.Parse(config.Numerical3);
+ needLVForTalent = int.Parse(config.Numerical4);
+
+
+ config = FuncConfigConfig.Get("TravelSet");
+ baseTravelEnergy = int.Parse(config.Numerical1);
+ recoverTravelEnergyTime = int.Parse(config.Numerical2);
+ travelRowCol = ConfigParse.GetMultipleStr<int>(config.Numerical3);
+ maxGirds = travelRowCol[0] * travelRowCol[1];
+
+
+ }
+
+
+ public void UpdateBeautyMMData(HB130_tagSCBeautyInfo data)
+ {
+ foreach (var beauty in data.BeautyList)
+ {
+ beautyMMDataDict[beauty.BeautyID] = new BeautyMMData()
+ {
+ State = beauty.State,
+ LV = beauty.LV,
+ Exp = beauty.Exp,
+ AwardLV = beauty.AwardLV,
+ };
+
+ foreach (var skin in beauty.SkinList)
+ {
+ beautyMMSkinDataDict[skin.SkinID] = new BeautyMMSkinData()
+ {
+ State = skin.State,
+ Used = skin.Used,
+ Star = skin.Star,
+ };
+ }
+ }
+ UpdateRedpoint();
+ OnBeautyMMDataUpdate?.Invoke();
+ }
+
+ //0 鍏ㄩ儴 1 宸叉縺娲� 2 鏈縺娲�
+ public void SortMMList(int type)
+ {
+ var _list = BeautyConfig.GetKeys();
+ beautyMMIDSortList.Clear();
+ if (type == 0)
+ {
+ beautyMMIDSortList = _list;
+ }
+ else if (type == 1)
+ {
+ foreach (var mmID in _list)
+ {
+ if (beautyMMDataDict.ContainsKey(mmID) && beautyMMDataDict[mmID].State == 1)
+ {
+ beautyMMIDSortList.Add(mmID);
+ }
+ }
+ }
+ else if (type == 2)
+ {
+ foreach (var mmID in _list)
+ {
+ if (!beautyMMDataDict.ContainsKey(mmID) || beautyMMDataDict[mmID].State == 0)
+ {
+ beautyMMIDSortList.Add(mmID);
+ }
+ }
+ }
+ beautyMMIDSortList.Sort(CmpMM);
+ }
+
+ int CmpMM(int mmIDA, int mmIDB)
+ {
+ bool isActiveA = false;
+ if (beautyMMDataDict.ContainsKey(mmIDA))
+ {
+ isActiveA = beautyMMDataDict[mmIDA].State == 1;
+ }
+ bool isActiveB = false;
+ if (beautyMMDataDict.ContainsKey(mmIDB))
+ {
+ isActiveB = beautyMMDataDict[mmIDB].State == 1;
+ }
+ if (isActiveA != isActiveB)
+ {
+ return isActiveA ? -1 : 1;
+ }
+ return mmIDA - mmIDB;
+ }
+
+
+ public BeautyMMData GetBeautyMMData(int mmID)
+ {
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ return beautyMMDataDict[mmID];
+ }
+ return null;
+ }
+
+ public int GetUsedSkinID(int mmID)
+ {
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ var _beauty = beautyMMDataDict[mmID];
+ if (_beauty.State == 1)
+ {
+ foreach (var skin in beautyMMSkinDataDict)
+ {
+ if (skin.Value.Used == 1)
+ {
+ return skin.Key;
+ }
+ }
+ }
+ }
+ //榛樿绗竴涓�
+ var _list = BeautySkinConfig.GetSkinListByMMID(mmID);
+ if (_list.Count > 0)
+ {
+ return _list[0].SkinID;
+ }
+
+ return 0;
+ }
+
+ public bool isActiveMM(int mmID)
+ {
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ return beautyMMDataDict[mmID].State == 1;
+ }
+ return false;
+ }
+
+ // 鑾峰彇MM澶╄祴灞炴�у睘鎬�, defaultAttr 鏄惁浣跨敤榛樿灞炴��
+ public Dictionary<int, int> GetMMTalentAttrForUI(int mmID, bool defaultAttr = false)
+ {
+ var _dict = new Dictionary<int, int>();
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ var _beauty = beautyMMDataDict[mmID];
+ if (_beauty.State == 1)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (config != null)
+ {
+ //鍒濆澶╄祴灞炴��
+ for (int i = 0; i < config.TalentAttrIDList.Length; i++)
+ {
+ _dict[config.TalentAttrIDList[i]] = config.TalentAttrValueList[i];
+ }
+
+ //鎸墄绾уソ鎰熷害鎻愬崌涓�绾уぉ璧嬫晥鏋�
+ var _lv = _beauty.LV;
+ var _addLV = _lv / needLVForTalent;
+ if (_addLV > 0)
+ {
+ for (int i = 0; i < config.TalentAttrIDList.Length; i++)
+ {
+ _dict[config.TalentAttrIDList[i]] += _addLV * config.TalentPerLVAddList[i];
+ }
+ }
+ }
+ return _dict;
+ }
+ }
+
+ if (defaultAttr)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (config != null)
+ {
+ //鍒濆澶╄祴灞炴��
+ for (int i = 0; i < config.TalentAttrIDList.Length; i++)
+ {
+ _dict[config.TalentAttrIDList[i]] = config.TalentAttrValueList[i];
+ }
+ }
+ }
+ return _dict;
+ }
+
+ // 鐪熷疄灞炴��
+ public Dictionary<int, int> GetMMTalentAttr(int mmID)
+ {
+ var _dict = new Dictionary<int, int>();
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ var _beauty = beautyMMDataDict[mmID];
+ if (_beauty.State == 1)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (config != null)
+ {
+ //鍒濆澶╄祴灞炴��
+ for (int i = 0; i < config.TalentAttrIDList.Length; i++)
+ {
+ _dict[config.TalentAttrIDList[i]] = config.TalentAttrValueList[i];
+ }
+
+ //鎸墄绾уソ鎰熷害鎻愬崌涓�绾уぉ璧嬫晥鏋�
+ var _lv = _beauty.LV;
+ var _addLV = _lv / needLVForTalent;
+ if (_addLV > 0)
+ {
+ for (int i = 0; i < config.TalentAttrIDList.Length; i++)
+ {
+ _dict[config.TalentAttrIDList[i]] += _addLV * config.TalentPerLVAddList[i];
+ }
+ }
+ }
+ return _dict;
+ }
+ }
+
+ return _dict;
+ }
+
+
+ public int GetMMTalentEffectForUI(int mmID, bool defaultAttr = true)
+ {
+ int _effect = 0;
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ var _beauty = beautyMMDataDict[mmID];
+ if (_beauty.State == 1)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (config != null)
+ {
+ //鍒濆澶╄祴鏁堟灉
+ _effect = config.EffValue;
+ //鎸墄绾уソ鎰熷害鎻愬崌涓�绾уぉ璧嬫晥鏋�
+ var _lv = _beauty.LV;
+ var _addLV = _lv / needLVForTalent;
+ if (_addLV > 0)
+ {
+ _effect += _addLV * config.EffPerLVAdd;
+ }
+ }
+ return _effect;
+ }
+ }
+
+ if (defaultAttr)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (config != null)
+ {
+ //鍒濆澶╄祴鏁堟灉
+ _effect = config.EffValue;
+ }
+ }
+ return _effect;
+ }
+
+ // 鑾峰彇MM澶╄祴鏁堟灉
+ public int GetMMTalentEffect(int mmID)
+ {
+ int _effect = 0;
+ if (beautyMMDataDict.ContainsKey(mmID))
+ {
+ var _beauty = beautyMMDataDict[mmID];
+ if (_beauty.State == 1)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (config != null)
+ {
+ //鍒濆澶╄祴鏁堟灉
+ _effect = config.EffValue;
+ //鎸墄绾уソ鎰熷害鎻愬崌涓�绾уぉ璧嬫晥鏋�
+ var _lv = _beauty.LV;
+ var _addLV = _lv / needLVForTalent;
+ if (_addLV > 0)
+ {
+ _effect += _addLV * config.EffPerLVAdd;
+ }
+ }
+ return _effect;
+ }
+ }
+ return _effect;
+ }
+
+ #region 绾㈢偣
+ Redpoint redpoint = new Redpoint(MainRedDot.MainAffairsRedpoint, MainRedDot.Redpoint_BeautyMM);
+ Redpoint redpointMM = new Redpoint(MainRedDot.Redpoint_BeautyMM, MainRedDot.Redpoint_BeautyMM * 10 + 1);
+ Redpoint redpointMMTotal = new Redpoint(MainRedDot.Redpoint_BeautyMM * 10 + 1, (MainRedDot.Redpoint_BeautyMM * 10 + 1) * 10);
+ Redpoint redpointMMKnown = new Redpoint((MainRedDot.Redpoint_BeautyMM * 10 + 1) * 10, (MainRedDot.Redpoint_BeautyMM * 10 + 1) * 10 + 1);
+ Redpoint redpointMMUnKnown = new Redpoint((MainRedDot.Redpoint_BeautyMM * 10 + 1) * 10, (MainRedDot.Redpoint_BeautyMM * 10 + 1) * 10 + 2);
+
+
+
+
+
+
+
+ void UpdateRedpoint()
+ {
+ redpointMMKnown.state = RedPointState.None;
+ redpointMMUnKnown.state = RedPointState.None;
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BeautyMM))
+ {
+ return;
+ }
+ var _list = BeautyConfig.GetValues();
+ foreach (var beauty in _list)
+ {
+ var state = GetMMBaseState(beauty);
+ if (state == 1)
+ {
+ redpointMMKnown.state = RedPointState.Simple;
+ }
+ else if (state == 2)
+ {
+ redpointMMUnKnown.state = RedPointState.Simple;
+ }
+ }
+
+ // 鏃惰MM 绾㈢偣
+ if (redpointMMKnown.state == RedPointState.None)
+ {
+ foreach (var beauty in _list)
+ {
+ if (IsMMSkinRed(beauty.BeautyID))
+ {
+ redpointMMKnown.state = RedPointState.Simple;
+ break;
+ }
+ }
+ }
+ }
+
+ //MM鍩虹鐘舵�� 0 鏃� 1 鏈夊鍔� 2 鍙墿鍝佹縺娲� 3 闇�鍔熻兘婵�娲�
+ public int GetMMBaseState(BeautyConfig beauty)
+ {
+ //鏄惁鍙縺娲伙紝鏄惁鏈夊鍔卞彲棰嗗彇
+ if (beautyMMDataDict.ContainsKey(beauty.BeautyID))
+ {
+ var _beauty = beautyMMDataDict[beauty.BeautyID];
+ if (_beauty.State == 1)
+ {
+ if (_beauty.LV > _beauty.AwardLV)
+ {
+ //鏈夊鍔卞彲棰嗗彇
+ return 1;
+ }
+ return 0;
+ }
+
+ }
+
+
+ //鍔熻兘鎬ф縺娲�
+ switch (beauty.UnlockWay)
+ {
+ case 1:
+ if (PackManager.Instance.GetItemCountByID(PackType.Item, beauty.UnlockValue) >= beauty.UnlockNeedCnt)
+ {
+ //鍙縺娲�
+ return 2;
+ }
+ break;
+ case 2:
+ if (TaskManager.Instance.mainTask.TaskID > beauty.UnlockValue)
+ {
+ //浠诲姟
+ return 3;
+ }
+ break;
+ case 3:
+ if (ArenaManager.Instance.totalWinCnt >= beauty.UnlockNeedCnt)
+ {
+ return 3;
+ }
+ break;
+ case 4:
+ if (GoldRushManager.Instance.maxWorkerCount >= beauty.UnlockNeedCnt)
+ {
+ //鍙縺娲�
+ return 3;
+ }
+ break;
+ case 5:
+ int dataMapID = BoneFieldManager.Instance.DataMapID;
+ if (DungeonManager.Instance.TryGetFBInfoByMapID(dataMapID, out var fbInfo))
+ {
+ if (BoneFieldManager.Instance.GetNowPassLineID(fbInfo) > beauty.UnlockValue)
+ {
+ return 3;
+ }
+ }
+ break;
+ case 6:
+ if (PlayerDatas.Instance.baseData.realmLevel >= beauty.UnlockValue)
+ {
+ return 3;
+ }
+ break;
+ case 7:
+ if (m_TravelCnt >= beauty.UnlockNeedCnt)
+ {
+ return 3;
+ }
+ break;
+ }
+
+
+
+ return 0;
+ }
+
+ // 鏃惰MM 鐘舵�� (鍓嶆彁鏄凡婵�娲绘湰浣撶殑鎯呭喌) 0 鏃� 1 鍙縺娲� 2 鍙崌鏄�;
+ public int GetMMSkinStateBySkinID(BeautySkinConfig skin)
+ {
+ if (beautyMMSkinDataDict.ContainsKey(skin.SkinID))
+ {
+ //鍗囨槦鍒ゆ柇
+ var _skin = beautyMMSkinDataDict[skin.SkinID];
+ if (_skin.State == 1)
+ {
+ if (_skin.Star < skin.StarMax && PackManager.Instance.GetItemCountByID(PackType.Item, skin.UnlockValue) >= skin.UpNeedCnt)
+ {
+ return 2;
+ }
+ return 0;
+ }
+ }
+
+ //婵�娲�
+ if (skin.UnlockWay == 2 && PackManager.Instance.GetItemCountByID(PackType.Item, skin.UnlockValue) >= skin.UnlockNeedCnt)
+ {
+ return 1;
+ }
+ return 0;
+ }
+
+
+
+ public bool IsMMSkinRed(int mmID)
+ {
+ var _list = BeautySkinConfig.GetSkinListByMMID(mmID);
+ if (_list == null || _list.Count == 0)
+ {
+ return false;
+ }
+ if (!beautyMMDataDict.ContainsKey(mmID))
+ {
+ return false;
+ }
+
+ var _beauty = beautyMMDataDict[mmID];
+ if (_beauty.State == 0)
+ {
+ return false;
+ }
+ foreach (var skin in _list)
+ {
+ if (GetMMSkinStateBySkinID(skin) > 0)
+ {
+ return true;
+ }
+ }
+ return false;
+
+ }
+
+ // 鍒ゆ柇鍩虹鐨勫吇鎴� 鍜� 鏃惰
+ public bool IsMMRed(int mmID)
+ {
+ var config = BeautyConfig.Get(mmID);
+ if (GetMMBaseState(config) > 0)
+ {
+ return true;
+ }
+
+ return IsMMSkinRed(mmID);
+ }
+
+ #endregion
+
+}
+
+
+public class BeautyMMData
+{
+ public byte State; //鏄惁宸叉縺娲�
+ public ushort LV; //绾㈤濂芥劅绛夌骇锛屾縺娲绘椂涓�0绾�
+ public ushort Exp; //褰撳墠绛夌骇缁忛獙
+ public ushort AwardLV; //宸茬粡棰嗗彇鍒扮殑濂栧姳绛夌骇璁板綍
+}
+public class BeautyMMSkinData {
+ public byte State; //鏄惁宸叉縺娲�
+ public byte Used; //鏄惁宸茬┛鎴磋鏃惰锛屾煇涓孩棰滅殑鎵�鏈夋椂瑁呯┛鎴村彲鑳介兘涓�0锛屽垯鍓嶇鍙栭粯璁ゆ椂瑁呰繘琛屽睍绀猴紝濡傛灉鏈夊悓姝ュ凡绌挎埓鐨勫垯浠ュ悗绔负鍑�
+ public byte Star; //鏃惰鏄熺骇锛屾縺娲绘椂涓�0鏄�
+}
\ No newline at end of file
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs.meta b/Main/System/BeautyMM/BeautyMMManager.cs.meta
new file mode 100644
index 0000000..47d47b5
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8f7899b33b25dc84ab06ff2189d57448
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMShowWin.cs b/Main/System/BeautyMM/BeautyMMShowWin.cs
new file mode 100644
index 0000000..809aafd
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMShowWin.cs
@@ -0,0 +1,443 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BeautyMMShowWin : UIBase
+{
+
+ [SerializeField] Image qualityImg;
+ [SerializeField] Text qualityText1; // 鍝佽川鍒嗕袱瀛楁樉绀猴紝娉ㄦ剰娴峰鐗堟湰
+ [SerializeField] Text qualityText2;
+ [SerializeField] Text nameText;
+ [SerializeField] Button descBtn;
+ [SerializeField] ImageEx roleImg;
+ [SerializeField] UIEffectPlayer roleUPEffect;
+ [SerializeField] Button leftBtn;
+ [SerializeField] Button rightBtn;
+ [SerializeField] Button skinBtn;
+
+ [SerializeField] Transform trainRect;
+ [SerializeField] Transform activeRect;
+
+ [SerializeField] Text activeTipText;
+ [SerializeField] Button activeBtn;
+
+ [SerializeField] Text lvNameText;
+ [SerializeField] Text lvText;
+ [SerializeField] Text expText;
+ [SerializeField] Image process;
+ [SerializeField] ItemCell showAwardCell;
+ [SerializeField] Button[] awardBtns; //灏忓鍔�
+ [SerializeField] Image[] awardImgs;
+ [SerializeField] Button seeAttrBtn;
+ [SerializeField] Text nextAddAttrText;
+ [SerializeField] Text[] talentTexts;
+ [SerializeField] Transform nextLVTalentTipRect;
+ [SerializeField] Text nextLVTalentTip;
+ [SerializeField] ScrollerController loveScroller;
+ [SerializeField] Toggle onekeyToggle;
+ [SerializeField] Button giftBtn;
+
+ [SerializeField] Transform giftOPRect;
+ [SerializeField] Transform fullRect;
+
+ int mmID;
+ BeautyConfig mmConfig;
+ List<int> itemlist = new List<int>();
+
+ protected override void InitComponent()
+ {
+ descBtn.AddListener(() =>
+ {
+ SmallTipWin.showText = mmConfig.Desc;
+ SmallTipWin.worldPos = CameraManager.uiCamera.ScreenToWorldPoint(Input.mousePosition);
+ SmallTipWin.isDownShow = true;
+ UIManager.Instance.OpenWindow<SmallTipWin>();
+ });
+
+ leftBtn.AddListener(() =>
+ {
+ var index = BeautyMMManager.Instance.beautyMMIDSortList.IndexOf(mmID);
+ if (index > 0)
+ {
+ mmID = BeautyMMManager.Instance.beautyMMIDSortList[index - 1];
+ }
+ else
+ {
+ mmID = BeautyMMManager.Instance.beautyMMIDSortList[BeautyMMManager.Instance.beautyMMIDSortList.Count - 1];
+ }
+ Display();
+ });
+ rightBtn.AddListener(() =>
+ {
+ var index = BeautyMMManager.Instance.beautyMMIDSortList.IndexOf(mmID);
+ if (index < BeautyMMManager.Instance.beautyMMIDSortList.Count - 1)
+ {
+ mmID = BeautyMMManager.Instance.beautyMMIDSortList[index + 1];
+ }
+ else
+ {
+ mmID = BeautyMMManager.Instance.beautyMMIDSortList[0];
+ }
+ Display();
+ });
+
+ skinBtn.AddListener(() =>
+ {
+ // UIManager.Instance.OpenWindow<BeautyMMListWin>();
+ });
+
+ seeAttrBtn.AddListener(() =>
+ {
+ // UIManager.Instance.OpenWindow<BeautyMMAttrWin>();
+ });
+
+ activeBtn.AddListener(ActiveMM);
+ giftBtn.AddListener(SendGift);
+
+ for (int i = 0; i < awardBtns.Length; i++)
+ {
+ awardBtns[i].AddListener(() =>
+ {
+ var pack = new CA504_tagCMPlayerGetReward();
+ pack.RewardType = 6;
+ pack.DataEx = (uint)mmID;
+ GameNetSystem.Instance.SendInfo(pack);
+ });
+ }
+ }
+
+
+ protected override void OnPreOpen()
+ {
+
+ mmID = functionOrder;
+ loveScroller.OnRefreshCell += OnRefreshCell;
+ BeautyMMManager.Instance.OnBeautyMMDataUpdate += OnBeautyMMDataUpdate;
+ PackManager.Instance.RefreshItemEvent += OnRefreshItemEvent;
+
+ Display();
+ }
+
+
+ protected override void OnPreClose()
+ {
+ loveScroller.OnRefreshCell -= OnRefreshCell;
+ BeautyMMManager.Instance.OnBeautyMMDataUpdate -= OnBeautyMMDataUpdate;
+ PackManager.Instance.RefreshItemEvent -= OnRefreshItemEvent;
+ }
+
+ void OnBeautyMMDataUpdate()
+ {
+ Display();
+ }
+
+ void OnRefreshItemEvent(PackType packType, int index, int itemID)
+ {
+ if (packType == PackType.Item)
+ {
+ if (itemlist.Contains(itemID))
+ {
+ loveScroller.m_Scorller.RefreshActiveCellViews();
+ }
+ }
+ }
+
+ void Display()
+ {
+ mmConfig = BeautyConfig.Get(mmID);
+ qualityImg.SetSprite($"mmMark{mmConfig.BeautyQuality}");
+ string qualityStr = Language.Get($"CommonQuality{mmConfig.BeautyQuality}");
+ qualityText1.text = qualityStr[0].ToString();
+ qualityText2.text = qualityStr.Substring(1);
+ nameText.text = mmConfig.Name;
+ var skinID = BeautyMMManager.Instance.GetUsedSkinID(mmID);
+ var skinConfig = BeautySkinConfig.Get(skinID);
+ roleImg.SetOrgSprite(skinConfig.BigRole, "BeautyMMBigRole");
+ roleImg.SetNativeSize();
+
+ var isActive = BeautyMMManager.Instance.isActiveMM(mmID);
+ trainRect.SetActive(isActive);
+ activeRect.SetActive(!isActive);
+ activeTipText.text = !isActive ? GetActiveTip(mmConfig) : "";
+
+ var mmData = BeautyMMManager.Instance.GetBeautyMMData(mmID);
+ var rank = mmData != null ? mmData.LV / BeautyMMManager.Instance.needLVForTalent + 1 : 1;
+ lvNameText.text = Language.Get($"BeautyMMLVName{rank}");
+ lvText.text = mmData != null ? mmData.LV.ToString() : "0";
+
+
+ var maxLV = BeautyQualityLVConfig.GetBeautyQualityMaxLV(mmConfig.BeautyQuality);
+ bool isMaxLV = mmData != null && mmData.LV >= maxLV;
+ int needExp;
+ if (isMaxLV)
+ {
+ needExp = 0;
+ process.fillAmount = 1;
+ showAwardCell.SetActive(false);
+ nextAddAttrText.text = Language.Get("L1055");
+ nextLVTalentTipRect.SetActive(false);
+ fullRect.SetActive(true);
+ giftOPRect.SetActive(false);
+ }
+ else
+ {
+ int curLV = mmData != null ? mmData.LV : 0;
+ BeautyQualityLVConfig nextLVConfig;
+ BeautyQualityLVConfig.TryGetBeautyQualityLVConfig(mmConfig.BeautyQuality, curLV + 1, out nextLVConfig);
+
+ needExp = nextLVConfig.LVNeedExp;
+ expText.text = (mmData != null ? mmData.Exp.ToString() : "0") + "/" + needExp;
+ process.fillAmount = mmData != null ? mmData.Exp / needExp : 0;
+ showAwardCell.SetActive(true);
+ int itemID = nextLVConfig.AwardItemList[0][0];
+ showAwardCell.Init(new ItemCellModel(itemID, false, nextLVConfig.AwardItemList[0][1]));
+ showAwardCell.button.AddListener(() =>
+ {
+ ItemTipUtility.Show(itemID);
+ });
+
+ var awardCnt = mmData != null ? mmData.LV - mmData.AwardLV : 0;
+ for (int i = 0; i < awardBtns.Length; i++)
+ {
+ if (mmData != null && i < awardCnt)
+ {
+ awardBtns[i].SetActive(true);
+ awardImgs[i].SetSprite(ItemConfig.Get(itemID).IconKey);
+ }
+ else
+ {
+ awardBtns[i].SetActive(false);
+ }
+ }
+ string format = "{0}" + UIHelper.AppendColor(TextColType.Green, "+{1}");
+ nextAddAttrText.text = Language.Get("BeautyMM23") + PlayerPropertyConfig.GetFullDescription(nextLVConfig.AttrIDList[0], nextLVConfig.AttrValueList[0], format);
+
+ ShowTalent();
+ nextLVTalentTipRect.SetActive(true);
+ nextLVTalentTip.text = Language.Get("BeautyMM26", rank * BeautyMMManager.Instance.needLVForTalent);
+ giftOPRect.SetActive(true);
+ fullRect.SetActive(false);
+ }
+
+ CreateScroller();
+
+ }
+
+
+
+ // 瑙ｉ攣鏂瑰紡 鏂瑰紡鍊� 鎵�闇�鏁�
+ // 1.鐗╁搧瑙ｉ攣 纰庣墖鐗╁搧ID 鏁伴噺
+ // 2.瀹屾垚涓荤嚎浠诲姟ID 浠诲姟ID
+ // 3.婕旀鍦鸿儨鍒╂鏁� 鏃� 娆℃暟
+ // 4.鎷ユ湁鐩戝伐鏁伴噺 鏃� 鏁伴噺
+ // 5.鐧介鐩堥噹杩囧叧 funcLineID
+ // 6.瀹樿亴杈惧埌 瀹樿亴ID
+ // 7.娓稿巻娆℃暟 鏃� 娆℃暟
+
+ string GetActiveTip(BeautyConfig beauty)
+ {
+ TextColType colorType = TextColType.Red;
+ switch (beauty.UnlockWay)
+ {
+ case 1:
+ var cnt = PackManager.Instance.GetItemCountByID(PackType.Item, beauty.UnlockValue);
+ colorType = cnt >= beauty.UnlockNeedCnt ? TextColType.Green : TextColType.Red;
+ return UIHelper.AppendColor(colorType, Language.Get("BeautyMMUnLockTip1", ItemConfig.Get(beauty.UnlockValue).IconKey, cnt, beauty.UnlockNeedCnt));
+ case 2:
+ colorType = TaskConfig.Get(TaskManager.Instance.mainTask.TaskID).Index > TaskConfig.Get(beauty.UnlockValue).Index ? TextColType.Green : TextColType.Red;
+ return Language.Get("BeautyMMUnLockTip2", TaskConfig.Get(beauty.UnlockValue).Index) +
+ UIHelper.AppendColor(colorType, Language.Get("HeroFates11", TaskConfig.Get(TaskManager.Instance.mainTask.TaskID).Index, TaskConfig.Get(beauty.UnlockValue).Index));
+ case 3:
+ colorType = ArenaManager.Instance.totalWinCnt >= beauty.UnlockNeedCnt ? TextColType.Green : TextColType.Red;
+ return Language.Get("BeautyMMUnLockTip3", beauty.UnlockNeedCnt) +
+ UIHelper.AppendColor(colorType, Language.Get("HeroFates11", ArenaManager.Instance.totalWinCnt, beauty.UnlockNeedCnt));
+ case 4:
+ colorType = GoldRushManager.Instance.maxWorkerCount >= beauty.UnlockNeedCnt ? TextColType.Green : TextColType.Red;
+ return Language.Get("BeautyMMUnLockTip4", beauty.UnlockNeedCnt) +
+ UIHelper.AppendColor(colorType, Language.Get("HeroFates11", GoldRushManager.Instance.maxWorkerCount, beauty.UnlockNeedCnt));
+ case 5:
+ int dataMapID = BoneFieldManager.Instance.DataMapID;
+ if (DungeonManager.Instance.TryGetFBInfoByMapID(dataMapID, out var fbInfo))
+ {
+ colorType = fbInfo.PassLineID > beauty.UnlockValue ? TextColType.Green : TextColType.Red;
+ return Language.Get("BeautyMMUnLockTip5", beauty.UnlockValue) +
+ UIHelper.AppendColor(colorType, Language.Get("HeroFates11", fbInfo.PassLineID, beauty.UnlockValue));
+ }
+ return "";
+ case 6:
+ colorType = PlayerDatas.Instance.baseData.realmLevel >= beauty.UnlockValue ? TextColType.Green : TextColType.Red;
+ var config = RealmConfig.Get(beauty.UnlockValue);
+ return Language.Get("BeautyMMUnLockTip6", config.Name) +
+ UIHelper.AppendColor(colorType, Language.Get("HeroFates11", PlayerDatas.Instance.baseData.realmLevel, beauty.UnlockValue));
+ case 7:
+ colorType = BeautyMMManager.Instance.m_TravelCnt >= beauty.UnlockNeedCnt ? TextColType.Green : TextColType.Red;
+ return Language.Get("BeautyMMUnLockTip7", beauty.UnlockNeedCnt) +
+ UIHelper.AppendColor(colorType, Language.Get("HeroFates11", BeautyMMManager.Instance.m_TravelCnt, beauty.UnlockNeedCnt));
+ }
+ return "";
+ }
+
+
+ void ShowTalent()
+ {
+ //鍏堟樉绀哄ぉ璧嬪睘鎬э紝鍐嶆樉绀哄ぉ璧嬬壒鎬�
+ var attrs = BeautyMMManager.Instance.GetMMTalentAttrForUI(mmID, true);
+ int talentIndex = 0;
+ if (attrs.IsNullOrEmpty())
+ {
+ talentIndex = 0;
+ }
+ else
+ {
+ foreach (var attr in attrs)
+ {
+ if (talentIndex < talentTexts.Length)
+ {
+ talentTexts[talentIndex].SetActive(true);
+ string format = "{0}" + UIHelper.AppendColor(TextColType.Green, "+{1}");
+ talentTexts[talentIndex].text = PlayerPropertyConfig.GetFullDescription(attr.Key, attr.Value, format);
+ }
+ else
+ {
+ break;
+ }
+ talentIndex++;
+ }
+ }
+
+
+ var talentValue = BeautyMMManager.Instance.GetMMTalentEffectForUI(mmID);
+ for (int i = talentIndex; i < talentTexts.Length; i++)
+ {
+ if (i == talentIndex && mmConfig.EffType != 0)
+ {
+ //澶╄祴鏁堟灉绾﹀畾鏈�澶氫竴涓�
+ talentTexts[talentIndex].SetActive(true);
+ switch (mmConfig.EffType)
+ {
+ case 1:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent1", talentValue);
+ break;
+ case 2:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
+ break;
+ case 3:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent3", talentValue);
+ break;
+ case 4:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ break;
+ }
+ }
+ else
+ {
+ talentTexts[i].SetActive(false);
+ }
+ }
+ }
+
+ void ActiveMM()
+ {
+ var state = BeautyMMManager.Instance.GetMMBaseState(mmConfig);
+ if (state <= 1)
+ {
+ SysNotifyMgr.Instance.ShowTip("BeautyMM1");
+ return;
+ }
+ var pack = new CB219_tagCSBeautyActivate();
+ pack.BeautyID = (ushort)mmID;
+ GameNetSystem.Instance.SendInfo(pack);
+ }
+
+
+ void CreateScroller()
+ {
+ loveScroller.Refresh();
+ itemlist = BeautyMMManager.Instance.loveItemIDs.ToList();
+ BeautyMMManager.Instance.selectLoveItemID = itemlist[0];
+ if (mmConfig.ExclusiveItemID > 0)
+ {
+ itemlist.Add(mmConfig.ExclusiveItemID); //涓撳睘淇＄墿
+ }
+
+ for (int i = 0; i < itemlist.Count; i++)
+ {
+ loveScroller.AddCell(ScrollerDataType.Header, itemlist[i]);
+ }
+ loveScroller.Restart();
+ }
+
+ void OnRefreshCell(ScrollerDataType type, CellView cell)
+ {
+ var _cell = cell.GetComponent<ItemCell>();
+ int itemID = cell.index;
+ var cnt = PackManager.Instance.GetItemCountByID(PackType.Item, itemID);
+ _cell.Init(new ItemCellModel(itemID, false, cnt));
+ _cell.button.AddListener(() =>
+ {
+ if (BeautyMMManager.Instance.selectLoveItemID != itemID)
+ {
+ BeautyMMManager.Instance.selectLoveItemID = itemID;
+ loveScroller.m_Scorller.RefreshActiveCellViews();
+ }
+ else
+ {
+ ItemTipUtility.Show(itemID);
+ }
+ });
+
+ if (BeautyMMManager.Instance.selectLoveItemID == itemID)
+ {
+ _cell.FindComponent("Image", "selectImage").SetActive(true);
+ }
+ else
+ {
+ _cell.FindComponent("Image", "selectImage").SetActive(false);
+ }
+
+ _cell.FindComponent("Image", "mask").SetActive(cnt == 0);
+ }
+
+ void SendGift()
+ {
+ var cnt = PackManager.Instance.GetItemCountByID(PackType.Item, BeautyMMManager.Instance.selectLoveItemID);
+ if (cnt == 0)
+ {
+ ItemTipUtility.Show(BeautyMMManager.Instance.selectLoveItemID, true);
+ return;
+ }
+ //浣跨敤鍒板彲鍗囩骇鐨勬暟閲忥紝鎴栬�呮�绘暟
+ var mmData = BeautyMMManager.Instance.GetBeautyMMData(mmID);
+ var maxLV = BeautyQualityLVConfig.GetBeautyQualityMaxLV(mmConfig.BeautyQuality);
+ bool isMaxLV = mmData != null && mmData.LV >= maxLV;
+ if (isMaxLV)
+ {
+ return;
+ }
+ else
+ {
+ int curLV = mmData != null ? mmData.LV : 0;
+ BeautyQualityLVConfig nextLVConfig;
+ BeautyQualityLVConfig.TryGetBeautyQualityLVConfig(mmConfig.BeautyQuality, curLV + 1, out nextLVConfig);
+
+ int needExp = nextLVConfig.LVNeedExp - mmData.Exp;
+ int value = BeautyMMManager.Instance.giftIDToLoveDict.ContainsKey(BeautyMMManager.Instance.selectLoveItemID) ?
+ BeautyMMManager.Instance.giftIDToLoveDict[BeautyMMManager.Instance.selectLoveItemID] : BeautyMMManager.Instance.specialGiftLove;
+
+ int useCnt = (int)Mathf.Min(Mathf.CeilToInt(needExp * 1.0f / value), cnt);
+ var pack = new CB220_tagCSBeautyLVUP();
+ pack.BeautyID = (ushort)mmID;
+ pack.ItemID = (uint)BeautyMMManager.Instance.selectLoveItemID;
+ pack.IsQuick = (byte)(onekeyToggle.isOn ? 1 : 0);
+ GameNetSystem.Instance.SendInfo(pack);
+ roleUPEffect.Play();
+ SysNotifyMgr.Instance.ShowTip("BeautyMM2", mmConfig.Name, useCnt * value);
+ }
+
+
+ }
+
+}
diff --git a/Main/System/BeautyMM/BeautyMMShowWin.cs.meta b/Main/System/BeautyMM/BeautyMMShowWin.cs.meta
new file mode 100644
index 0000000..3a4fa4a
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMShowWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 51e44717165ef6d4d945d1dfad6a83a6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMTravelCell.cs b/Main/System/BeautyMM/BeautyMMTravelCell.cs
new file mode 100644
index 0000000..a1fbd30
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMTravelCell.cs
@@ -0,0 +1,148 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BeautyMMTravelCell : MonoBehaviour
+{
+ [SerializeField] Button clickGirdBtn; //鏍规嵁鐘舵�佸喅瀹�
+ [SerializeField] Image itemImage;
+ [SerializeField] Text multiText;
+ [SerializeField] Image horseImg;
+ [SerializeField] Image notOpenImg;
+ [SerializeField] Image crackImg; // 鐮寸鍥炬爣
+ [SerializeField] UIEffectPlayer openEffect;
+ [SerializeField] UIEffectPlayer boomEffect;
+ [SerializeField] UIEffectPlayer gateEffect;
+
+
+ public void Display(int index)
+ {
+ Int2 girdPos = BeautyMMManager.Instance.ChangeIndexToGrid(index);
+ var grid = BeautyMMManager.Instance.GetGrid(girdPos);
+
+ clickGirdBtn.AddListener(() =>
+ {
+ ClickGird(girdPos, grid);
+ });
+
+ if (grid == null)
+ {
+ notOpenImg.SetActive(true);
+ itemImage.SetActive(false);
+ horseImg.SetActive(false);
+ crackImg.SetActive(false);
+ gateEffect.SetActive(false);
+ return;
+ }
+
+ ////鐘舵�侊細0-鏈偣鍑伙紱1-宸插紑鍚紱2-瑁傜汗
+ if (grid.State == 0 || grid.State == 2)
+ {
+ notOpenImg.SetActive(true);
+ itemImage.SetActive(false);
+ horseImg.SetActive(false);
+ crackImg.SetActive(grid.State == 2);
+ gateEffect.SetActive(false);
+ return;
+ }
+
+ notOpenImg.SetActive(false);
+ // 99 - 浠ｈ〃璇ユ牸鏄� 浼犻�侀棬
+ // 100 - 浠ｈ〃璇ユ牸鏄� 绌烘牸瀛�
+ // 101 - 浠ｈ〃璇ユ牸鏄� 椹尮
+ // 澶т簬200 瀵瑰簲琛ㄩ噷鐨� 鐗╁搧
+ if (grid.EventID == 99)
+ {
+ gateEffect.SetActive(true);
+ gateEffect.Play();
+ itemImage.SetActive(false);
+ horseImg.SetActive(false);
+ crackImg.SetActive(false);
+ }
+ else if (grid.EventID == 100)
+ {
+ itemImage.SetActive(false);
+ horseImg.SetActive(false);
+ crackImg.SetActive(false);
+ gateEffect.SetActive(false);
+ }
+ else if (grid.EventID == 101)
+ {
+ itemImage.SetActive(false);
+ horseImg.SetActive(true);
+ crackImg.SetActive(false);
+ gateEffect.SetActive(false);
+ }
+ else if (grid.EventID > 200)
+ {
+ itemImage.SetActive(true);
+ horseImg.SetActive(false);
+ crackImg.SetActive(false);
+ gateEffect.SetActive(false);
+ itemImage.SetItemSprite(TravelEventConfig.Get(grid.EventID).AwardItemID);
+ if (grid.Multi > 1)
+ {
+ multiText.text = $"x{grid.Multi}";
+ }
+ else
+ {
+ multiText.text = "";
+ }
+ }
+ else
+ {
+ itemImage.SetActive(false);
+ horseImg.SetActive(false);
+ crackImg.SetActive(false);
+ gateEffect.SetActive(false);
+ }
+
+ if (BeautyMMManager.Instance.openChangeGridList.Contains(girdPos))
+ {
+ openEffect.Play();
+ }
+
+
+ }
+
+
+ // 99 - 浠ｈ〃璇ユ牸鏄� 浼犻�侀棬
+ // 100 - 浠ｈ〃璇ユ牸鏄� 绌烘牸瀛�
+ // 101 - 浠ｈ〃璇ユ牸鏄� 椹尮
+ // 澶т簬200 瀵瑰簲琛ㄩ噷鐨� 鐗╁搧
+ void ClickGird(Int2 girdPos, TravelGrid grid)
+ {
+ ////鐘舵�侊細0-鏈偣鍑伙紱1-宸插紑鍚紱2-瑁傜汗
+ if (grid.State == 0 || grid.State == 2)
+ {
+ SoundPlayer.Instance.PlayUIAudio(25);
+ }
+
+ if (grid.EventID == 100)
+ {
+ // 绌烘牸瀛�
+ return;
+ }
+ if (grid.EventID < 99 && grid.EventID > 0)
+ {
+ //鍒ゆ柇寤虹瓚鏄惁閮藉紑鍏ㄤ簡娌�
+ if (!BeautyMMManager.Instance.CanOpenBuild())
+ {
+ SysNotifyMgr.Instance.ShowTip("BeautyMM3");
+ return;
+ }
+ }
+ if (grid.EventID == 101)
+ {
+ boomEffect.Play();
+ }
+
+
+ var pack = new CB040_tagCSTravelClick();
+ pack.Row = (byte)girdPos.x;
+ pack.Col = (byte)girdPos.y;
+ GameNetSystem.Instance.SendInfo(pack);
+ BeautyMMManager.Instance.clickGirdPos = girdPos;
+
+ }
+}
diff --git a/Main/System/BeautyMM/BeautyMMTravelCell.cs.meta b/Main/System/BeautyMM/BeautyMMTravelCell.cs.meta
new file mode 100644
index 0000000..4b3790b
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMTravelCell.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 71e82a96c3e36af4f97b52bcebc58d36
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BeautyMM/BeautyMMTravelWin.cs b/Main/System/BeautyMM/BeautyMMTravelWin.cs
new file mode 100644
index 0000000..860de82
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMTravelWin.cs
@@ -0,0 +1,202 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BeautyMMTravelWin : UIBase
+{
+ [SerializeField] Button rateTipBtn;
+ [SerializeField] Transform rateTipRect;
+ [SerializeField] Text[] rateNameText;
+ [SerializeField] Text[] rateText;
+ [SerializeField] Text horseRateText;
+ [SerializeField] Image[] buildImgs;
+ [SerializeField] GameObject girdsGo;
+ [SerializeField] UIEffectPlayer boomRowEffect;
+ [SerializeField] UIEffectPlayer boomColEffect;
+ [SerializeField] Image processImg;
+ [SerializeField] Text processText;
+ [SerializeField] Text timeText;
+
+ List<BeautyMMTravelCell> girds;
+
+ [SerializeField] Button buildResultBtn;
+ [SerializeField] UIEffectPlayer buildResultEffect;
+ [SerializeField] Image[] whatImgs;
+ [SerializeField] Image[] rightImgs;
+ [SerializeField] Image[] wrongImgs;
+
+ float gridWidth = 0;
+ float gridHeight = 0;
+
+ protected override void InitComponent()
+ {
+ girds = girdsGo.GetComponentsInChildren<BeautyMMTravelCell>().ToList();
+ rateTipBtn.AddListener(() =>
+ {
+ rateTipRect.SetActive(true);
+ });
+ DisplyRate();
+
+ buildResultBtn.AddListener(BuildLVUP);
+ }
+
+ protected override void OnPreOpen()
+ {
+
+ BeautyMMManager.Instance.OnTravelInfoUpdate += OnTravelInfoUpdate;
+ BeautyMMManager.Instance.openChangeGridList.Clear();
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
+ rateTipRect.SetActive(false);
+
+ Display();
+ DisplayBuildResult();
+ }
+
+ protected override void OnPreClose()
+ {
+ BeautyMMManager.Instance.OnTravelInfoUpdate -= OnTravelInfoUpdate;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+ }
+
+ void OnTravelInfoUpdate(int result)
+ {
+ //鍚庣澶勭悊锛�0-鏃狅紱1-甯歌锛�2-椹溅鐐稿脊锛�3-浼犻�侀棬锛�4-鏅锛�5-閲嶇疆寮�濮�
+ Display();
+ if (result == 2)
+ {
+ //BeautyMMManager.Instance.clickGirdPos
+ boomRowEffect.transform.localPosition = new Vector3(0,
+ -((BeautyMMManager.Instance.clickGirdPos.x - 1) * gridHeight + gridHeight / 2), 0);
+ boomRowEffect.Play();
+ boomColEffect.transform.localPosition = new Vector3((BeautyMMManager.Instance.clickGirdPos.y - 1) * gridWidth + gridWidth / 2, boomColEffect.transform.localPosition.y, 0);
+ boomColEffect.Play();
+ }
+ DisplayBuildResult();
+ }
+
+ void Display()
+ {
+ for (int i = 0; i < girds.Count; i++)
+ {
+ girds[i].Display(i);
+ }
+
+ var showIndex = -1;
+ if (BeautyMMManager.Instance.m_SceneryType == 1)
+ {
+ showIndex = 0;
+ }
+ else if (BeautyMMManager.Instance.m_SceneryType == 4)
+ {
+ showIndex = 1;
+ }
+ else if (BeautyMMManager.Instance.m_SceneryType == 6)
+ {
+ showIndex = 2;
+ }
+
+ var hasDoor = BeautyMMManager.Instance.HasDoor();
+ for (int i = 0; i < buildImgs.Length; i++)
+ {
+ if (i == showIndex && !hasDoor)
+ {
+ buildImgs[i].SetActive(true);
+ //鏍规嵁鐖剁粍浠剁殑瀹介珮锛屽拰鏍煎瓙鍧愭爣璁＄畻璧风偣鍧愭爣
+ if (gridWidth == 0 || gridHeight == 0)
+ {
+ var parentRect = buildImgs[i].transform.parent.GetComponent<RectTransform>();
+ var parentWidth = parentRect.rect.width;
+ var parentHeight = parentRect.rect.height;
+ gridWidth = parentWidth / BeautyMMManager.Instance.travelRowCol[1];
+ gridHeight = parentHeight / BeautyMMManager.Instance.travelRowCol[0];
+ }
+ var x = (BeautyMMManager.Instance.m_SceneryCol - 1) * gridWidth + 2;
+ var y = (BeautyMMManager.Instance.m_SceneryRow - 1) * gridHeight + 2;
+ buildImgs[i].transform.localPosition = new Vector3(x, -y, 0);
+ }
+ else
+ {
+ buildImgs[i].SetActive(false);
+ }
+ }
+ }
+
+ void DisplyRate()
+ {
+ rateTipRect.SetActive(false);
+ var keys = TravelEventConfig.GetKeys();
+ var index = 0;
+ for (int i = 0; i < keys.Count; i++)
+ {
+ var config = TravelEventConfig.Get(keys[i]);
+ if (config.EventID < 200)
+ {
+ continue;
+ }
+ rateNameText[index].text = ItemConfig.Get(config.AwardItemID).ItemName + "x" + config.AwardItemCnt;
+ rateText[index].text = config.ShowRate;
+ index++;
+ }
+ horseRateText.text = TravelEventConfig.Get(101).ShowRate;
+ }
+
+ //寤虹瓚鐗规晥鍝佽川 1-1073 2-1078 3-1083
+ Dictionary<int, int> buildEffectDic = new Dictionary<int, int>()
+ {
+ {1, 1073},
+ {2, 1078},
+ {3, 1083}
+ };
+ void DisplayBuildResult()
+ {
+ if (!IsShowBuildUpgradeUI())
+ {
+ buildResultBtn.SetActive(false);
+ return;
+ }
+ buildResultBtn.SetActive(true);
+
+
+ }
+
+ void BuildLVUP()
+ {
+ var pack = new CB041_tagCSTravelSceneryUP();
+ GameNetSystem.Instance.SendInfo(pack);
+ }
+
+ //鏄惁鏄剧ず寤虹瓚鍗囩骇UI
+ bool IsShowBuildUpgradeUI()
+ {
+
+ //閲嶇櫥鍚� m_Result 鏄�0 ,渚濈劧瑕侀亶鍘嗗垽鏂�
+ //濡傛灉宸茬粡鏈夐棬浜�
+ if (BeautyMMManager.Instance.HasDoor())
+ {
+ return false;
+ }
+ //m_Result 鍙敤浜庡嵆鏃跺垽鏂�
+ if (BeautyMMManager.Instance.m_SceneryLVInfo == 0 && BeautyMMManager.Instance.m_Result != 4)
+ {
+ return false;
+ }
+ return true;
+ }
+
+ void OnCloseWindow(UIBase ui)
+ {
+ if (ui is CommonGetItemWin)
+ {
+ var gird = BeautyMMManager.Instance.GetGrid(BeautyMMManager.Instance.clickGirdPos);
+ if (gird != null && gird.EventID == (int)GirdEventType.Door)
+ {
+ //榛樿璇锋眰涓嬩竴灞�
+ var pack = new CB040_tagCSTravelClick();
+ pack.Row = (byte)BeautyMMManager.Instance.clickGirdPos.x;
+ pack.Col = (byte)BeautyMMManager.Instance.clickGirdPos.y;
+ GameNetSystem.Instance.SendInfo(pack);
+ }
+ }
+ }
+}
diff --git a/Main/System/BeautyMM/BeautyMMTravelWin.cs.meta b/Main/System/BeautyMM/BeautyMMTravelWin.cs.meta
new file mode 100644
index 0000000..9008ae2
--- /dev/null
+++ b/Main/System/BeautyMM/BeautyMMTravelWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 35624c157a4b5364f902d10f570bef5a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/BoneField/AdsManager.cs b/Main/System/BoneField/AdsManager.cs
index 401c315..fa678ec 100644
--- a/Main/System/BoneField/AdsManager.cs
+++ b/Main/System/BoneField/AdsManager.cs
@@ -52,6 +52,7 @@
SendGetReward(ADID);
break;
case 4:
+ case 6:
SendGetReward(ADID);
break;
}
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index ad0a9e9..142839b 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -186,18 +186,29 @@
}
}
+ bool needMoreDrop = false; //鐢变簬鎺夎惤鎸ゅ帇瀵艰嚧锛屾弧鎺夎惤鎺夎惤鑳屽寘鐨勬椂鍊欏鐞嗗悗鍐嶄富鍔ㄨ姹傛帀钀�
//澶勭悊鎵�鏈夋帀钀界殑鐗╁搧
public void CalcAllFloorItems()
{
- if (PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems().Count == 0)
+ int cnt = PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems().Count;
+ if (cnt == 0)
{
Debug.Log("CalcAllFloorItems 娌℃湁鎺夎惤鐗╁搧");
return;
}
+
+
+ needMoreDrop = cnt == 20;
+
//鏋勫缓鎵�鏈夌墿鍝�
foreach (var item in PackManager.Instance.GetSinglePack(PackType.DropItem).GetItems())
{
CalcFloorEquip(item.gridIndex);
+ }
+ if (needMoreDrop)
+ {
+ SendEquipOP(null, 3);
+ needMoreDrop = false;
}
}
@@ -279,8 +290,11 @@
// NoteFloorEquip(itemIndexList, opType);
var pack = new CB415_tagCSMainDropItemOP();
- pack.Count = (byte)itemIndexList.Length;
- pack.IndexList = itemIndexList;
+ if (itemIndexList != null)
+ {
+ pack.Count = (byte)itemIndexList.Length;
+ pack.IndexList = itemIndexList;
+ }
pack.OPType = opType;
pack.OPValue = (byte)(autoDecompose ? 1 : 0); // 鏇挎崲鍚庢槸鍚﹁嚜鍔ㄥ垎瑙ｅ師瑁呭锛�0鍚�1鏄�
@@ -291,6 +305,7 @@
Debug.LogWarning("绌挎埓瑁呭锛屽悜鏈嶅姟鍣ㄨ姹�");
}
GameNetSystem.Instance.SendInfo(pack);
+
}
/// <summary>
diff --git a/Main/System/InternalAffairs/AffairFuncCell.cs b/Main/System/InternalAffairs/AffairFuncCell.cs
index 31387b3..364921d 100644
--- a/Main/System/InternalAffairs/AffairFuncCell.cs
+++ b/Main/System/InternalAffairs/AffairFuncCell.cs
@@ -47,6 +47,10 @@
{
UIManager.Instance.OpenWindow<PhantasmPavilionWin>();
}
+ else if (funcID == 7)
+ {
+ UIManager.Instance.OpenWindow<BeautyMMBaseWin>();
+ }
}
diff --git a/Main/System/KnapSack/PackManager.cs b/Main/System/KnapSack/PackManager.cs
index 22e8b39..a552c96 100644
--- a/Main/System/KnapSack/PackManager.cs
+++ b/Main/System/KnapSack/PackManager.cs
@@ -412,6 +412,11 @@
if (serverItem.socketType == ServerType.Main && serverItem.PackType == (int)PackType.DropItem)
{
EquipModel.Instance.CalcFloorEquip(serverItem.ItemPlace);
+ if (serverItem.ItemPlace == 19)
+ {
+ //鍐嶅揩閫熷鐞嗕竴娆�
+ EquipModel.Instance.SendEquipOP(null, 3);
+ }
}
}
diff --git a/Main/System/Redpoint/MainRedDot.cs b/Main/System/Redpoint/MainRedDot.cs
index 1638c8c..219e838 100644
--- a/Main/System/Redpoint/MainRedDot.cs
+++ b/Main/System/Redpoint/MainRedDot.cs
@@ -76,7 +76,8 @@
Redpoint osGalaRedpoint = new Redpoint(RedPoint_OSGala);
public const int RedPoint_Download = 116;
-
+ //绾㈤
+ public const int Redpoint_BeautyMM = 117;
//姝﹀皢鍗�
public const int HeroCardRedpoint = 200;
public Redpoint HeroListRedpoint = new Redpoint(MainHerosRedpoint, HeroCardRedpoint);
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 5747238..eab9fb4 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -823,6 +823,7 @@
Hero = 1,//姝﹀皢
Challenge = 2,//鎸戞垬
Official = 3,//鍐呮斂
+ BeautyMM = 7,//绾㈤
GoldRush = 8, //娣橀噾
Realm = 10, //澧冪晫 瀹樿亴
Guild = 11,// 鍏細
--
Gitblit v1.8.0