星魂兑换增加位置选择
parent
b86d5dfeba
commit
23129de7bc
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="594,640">
|
<component size="594,640">
|
||||||
<controller name="quality" pages="0,1,1,2,2,3,3,4,4,5,5,6" selected="0"/>
|
<controller name="quality" pages="0,1,1,2,2,3,3,4,4,5,5,6" selected="0"/>
|
||||||
<controller name="sortType" pages="0,0,1,1,2,2" selected="2">
|
<controller name="sortType" pages="0,0,1,1,2,2" selected="0">
|
||||||
<remark page="0" value="时间"/>
|
<remark page="0" value="时间"/>
|
||||||
<remark page="1" value="套装"/>
|
<remark page="1" value="套装"/>
|
||||||
<remark page="2" value="位置"/>
|
<remark page="2" value="位置"/>
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
<text id="n23_jxet" name="n23" xy="393,464" size="36,24" group="n24_jxet" fontSize="15" color="#ffcc33" autoSize="none" strokeColor="#000000" text="套装"/>
|
<text id="n23_jxet" name="n23" xy="393,464" size="36,24" group="n24_jxet" fontSize="15" color="#ffcc33" autoSize="none" strokeColor="#000000" text="套装"/>
|
||||||
<group id="n24_jxet" name="n24" xy="369,464" size="60,24"/>
|
<group id="n24_jxet" name="n24" xy="369,464" size="60,24"/>
|
||||||
<component id="n25_jxet" name="btnPosType" src="czagl" fileName="ButtonSingle.xml" pkg="kqsmrpxl" xy="431,467" size="19,19" group="n27_jxet" aspect="true">
|
<component id="n25_jxet" name="btnPosType" src="czagl" fileName="ButtonSingle.xml" pkg="kqsmrpxl" xy="431,467" size="19,19" group="n27_jxet" aspect="true">
|
||||||
<Button checked="true" controller="sortType" page="2"/>
|
<Button controller="sortType" page="2"/>
|
||||||
</component>
|
</component>
|
||||||
<text id="n26_jxet" name="n26" xy="455,464" size="36,24" group="n27_jxet" fontSize="15" color="#ffcc33" autoSize="none" strokeColor="#000000" text="位置"/>
|
<text id="n26_jxet" name="n26" xy="455,464" size="36,24" group="n27_jxet" fontSize="15" color="#ffcc33" autoSize="none" strokeColor="#000000" text="位置"/>
|
||||||
<group id="n27_jxet" name="n27" xy="431,464" size="60,24"/>
|
<group id="n27_jxet" name="n27" xy="431,464" size="60,24"/>
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
<Button title="天工" controller="quality" page="5"/>
|
<Button title="天工" controller="quality" page="5"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n34_th4y" name="btnTime" src="czagl" fileName="ButtonSingle.xml" pkg="kqsmrpxl" xy="307,467" size="19,19" group="n36_th4y" aspect="true">
|
<component id="n34_th4y" name="btnTime" src="czagl" fileName="ButtonSingle.xml" pkg="kqsmrpxl" xy="307,467" size="19,19" group="n36_th4y" aspect="true">
|
||||||
<Button controller="sortType" page="0"/>
|
<Button checked="true" controller="sortType" page="0"/>
|
||||||
</component>
|
</component>
|
||||||
<text id="n35_th4y" name="n35" xy="331,464" size="36,24" group="n36_th4y" fontSize="15" color="#ffcc33" autoSize="none" strokeColor="#000000" text="时间"/>
|
<text id="n35_th4y" name="n35" xy="331,464" size="36,24" group="n36_th4y" fontSize="15" color="#ffcc33" autoSize="none" strokeColor="#000000" text="时间"/>
|
||||||
<group id="n36_th4y" name="n36" xy="307,464" size="60,24"/>
|
<group id="n36_th4y" name="n36" xy="307,464" size="60,24"/>
|
||||||
|
@ -158,12 +158,18 @@
|
||||||
<group id="n52_t2ks" name="n52" xy="289,550" size="218,48" advanced="true">
|
<group id="n52_t2ks" name="n52" xy="289,550" size="218,48" advanced="true">
|
||||||
<gearDisplay controller="attribute" pages="1"/>
|
<gearDisplay controller="attribute" pages="1"/>
|
||||||
</group>
|
</group>
|
||||||
<component id="n53_cwlt" name="comBoxGetStarSoul" src="tc2rtm7" fileName="ComboBox.xml" xy="214,549" size="90,24">
|
<component id="n53_cwlt" name="comBoxGetStarSoul" src="tc2rtm7" fileName="ComboBox.xml" xy="214,549" size="90,24" group="n56_i88r">
|
||||||
<ComboBox visibleItemCount="10" autoClearItems="true"/>
|
<ComboBox visibleItemCount="10" autoClearItems="true"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n54_cwlt" name="btnGetStarSoul" src="y69ujo" fileName="ButtonOnlyText.xml" pkg="kqsmrpxl" xy="223,576" size="72,25">
|
<component id="n54_cwlt" name="btnGetStarSoul" src="y69ujo" fileName="ButtonOnlyText.xml" pkg="kqsmrpxl" xy="263,579" size="72,25" group="n56_i88r">
|
||||||
<Button title="兑换星魂"/>
|
<Button title="兑换星魂"/>
|
||||||
</component>
|
</component>
|
||||||
|
<component id="n55_i88r" name="comBoxGetStarSoulPosType" src="tc2rtm7" fileName="ComboBox.xml" xy="310,549" size="90,24" group="n56_i88r">
|
||||||
|
<ComboBox visibleItemCount="10" autoClearItems="true"/>
|
||||||
|
</component>
|
||||||
|
<group id="n56_i88r" name="n56" xy="214,549" size="186,55" advanced="true">
|
||||||
|
<gearDisplay controller="attribute" pages="0"/>
|
||||||
|
</group>
|
||||||
</displayList>
|
</displayList>
|
||||||
<transition name="Effect"/>
|
<transition name="Effect"/>
|
||||||
</component>
|
</component>
|
Binary file not shown.
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"urls": "http://*:2085",
|
"urls": "http://*:2083",
|
||||||
"DirectoryPath": "../Release/"
|
"DirectoryPath": "../Release/"
|
||||||
}
|
}
|
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 4104919332
|
CRC: 2883122647
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 6eedb7d8e78462a215f8ad9192bfb47e
|
Hash: f29010a7c8c970d78f92448c8769ef6a
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 69045bbca4070762a03d9308d3c1cfd0
|
Hash: 69045bbca4070762a03d9308d3c1cfd0
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 687290384
|
CRC: 2791751509
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 91f71a1db1e394addb667b9d13bc6f4e
|
Hash: d029a8ebf3a7164863a7b8e413e27fca
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 5ad585dd02dfb5016c0dad519eab8f49
|
Hash: 5ad585dd02dfb5016c0dad519eab8f49
|
||||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 2015045227
|
CRC: 1033682034
|
||||||
AssetBundleManifest:
|
AssetBundleManifest:
|
||||||
AssetBundleInfos:
|
AssetBundleInfos:
|
||||||
Info_0:
|
Info_0:
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 3113693101
|
CRC: 2669173570
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: f8b2a28354bff2b902b7256c9b275092
|
Hash: a869f234ec5397bf14dff85eb9421140
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 82236c946205e8236ca7243243cff09a
|
Hash: 82236c946205e8236ca7243243cff09a
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 586091015
|
CRC: 1568336651
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 1fbd54b095aa77d73eb2a0ee5ea9a24f
|
Hash: 3837919663604b38ac6b1d4b956f3ec0
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 69045bbca4070762a03d9308d3c1cfd0
|
Hash: 69045bbca4070762a03d9308d3c1cfd0
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 4005557802
|
CRC: 4052730398
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: c61b44b358c846e0ad8c12fe2e99b177
|
Hash: 6f6eedf19964a8db4206fd26575181f0
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 5ad585dd02dfb5016c0dad519eab8f49
|
Hash: 5ad585dd02dfb5016c0dad519eab8f49
|
||||||
|
|
BIN
Release/OSX/OSX
BIN
Release/OSX/OSX
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 604448891
|
CRC: 425650234
|
||||||
AssetBundleManifest:
|
AssetBundleManifest:
|
||||||
AssetBundleInfos:
|
AssetBundleInfos:
|
||||||
Info_0:
|
Info_0:
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 1403759679
|
CRC: 366958323
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 17b53ebe3171ab79ba4ca954720bb1aa
|
Hash: d934c6893cc607f8f40d6f93f9ebf6e1
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 82236c946205e8236ca7243243cff09a
|
Hash: 82236c946205e8236ca7243243cff09a
|
||||||
|
|
BIN
Release/OSX/res
BIN
Release/OSX/res
Binary file not shown.
BIN
Release/OSX/ver
BIN
Release/OSX/ver
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 3040700806
|
CRC: 3655515645
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: f3ef19fd65743ef31dcd7dc70c629413
|
Hash: ee0ff40b41edd577f5a1a236090d7e87
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 69045bbca4070762a03d9308d3c1cfd0
|
Hash: 69045bbca4070762a03d9308d3c1cfd0
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 1608664168
|
CRC: 1713289589
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 2adb52edd2f2ff7fc4c05d60b2250f07
|
Hash: 133f3fd1188bbdfef2d0287ba161d079
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 5ad585dd02dfb5016c0dad519eab8f49
|
Hash: 5ad585dd02dfb5016c0dad519eab8f49
|
||||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 1514413515
|
CRC: 2476477572
|
||||||
AssetBundleManifest:
|
AssetBundleManifest:
|
||||||
AssetBundleInfos:
|
AssetBundleInfos:
|
||||||
Info_0:
|
Info_0:
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 808447192
|
CRC: 4119660520
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 7fe2938fd409a46956573c5a5fecc161
|
Hash: cb06c1f5b081217c32e705a6e182e783
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 82236c946205e8236ca7243243cff09a
|
Hash: 82236c946205e8236ca7243243cff09a
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -189,22 +189,24 @@ namespace ET
|
||||||
Log.Error($"type={type} difficulty={difficulty}");
|
Log.Error($"type={type} difficulty={difficulty}");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (difficulty == 0)
|
if (difficulty == 0)
|
||||||
{
|
{
|
||||||
Log.Error($"type={type} difficulty={difficulty}");
|
Log.Error($"type={type} difficulty={difficulty}");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var list= StarSoulTypeConfigCategory.Instance.idDic[type];
|
var list = StarSoulTypeConfigCategory.Instance.idDic[type];
|
||||||
if (list.Count != 0)
|
if (list.Count != 0)
|
||||||
{
|
{
|
||||||
int id = list.RandomArray();
|
int id = list.RandomArray();
|
||||||
return GenerateStarSoulItem(id, (Quality)difficulty);
|
return GenerateStarSoulItem(id, (Quality) difficulty);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
public static StarSoulItem GenerateStarSoulItem(int typeId,Quality starQuality = Quality.Common)
|
|
||||||
|
public static StarSoulItem GenerateStarSoulItem(EquipType equipType, int typeId, Quality starQuality = Quality.Common)
|
||||||
{
|
{
|
||||||
StarSoulItem item = new();
|
StarSoulItem item = new();
|
||||||
item.typeId = typeId;
|
item.typeId = typeId;
|
||||||
|
@ -221,7 +223,7 @@ namespace ET
|
||||||
Quality quality = (Quality) qualityInt;
|
Quality quality = (Quality) qualityInt;
|
||||||
item.quality = quality;
|
item.quality = quality;
|
||||||
item.Id = Game.IdGenerater.GenerateId();
|
item.Id = Game.IdGenerater.GenerateId();
|
||||||
item.posType = (EquipType) RandomHelper.RandomNumber(0, 12);
|
item.posType = equipType;
|
||||||
long mainId = GenerateMain(item.posType, quality);
|
long mainId = GenerateMain(item.posType, quality);
|
||||||
if (mainId == -1) return null;
|
if (mainId == -1) return null;
|
||||||
item.mainId = (int) mainId;
|
item.mainId = (int) mainId;
|
||||||
|
@ -229,7 +231,7 @@ namespace ET
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
|
|
||||||
static long GenerateMain(EquipType type,Quality qualityInt)
|
static long GenerateMain(EquipType type, Quality qualityInt)
|
||||||
{
|
{
|
||||||
StarSoulEquipAttributeTypeConfig starSoulEquipAttributeTypeConfig =
|
StarSoulEquipAttributeTypeConfig starSoulEquipAttributeTypeConfig =
|
||||||
StarSoulEquipAttributeTypeConfigCategory.Instance.Get((long) type);
|
StarSoulEquipAttributeTypeConfigCategory.Instance.Get((long) type);
|
||||||
|
@ -239,6 +241,7 @@ namespace ET
|
||||||
{
|
{
|
||||||
weightList.List.Add(attributeType.Prob);
|
weightList.List.Add(attributeType.Prob);
|
||||||
}
|
}
|
||||||
|
|
||||||
int mainIndex = RandomHelper.RandomByWeight(weightList.List);
|
int mainIndex = RandomHelper.RandomByWeight(weightList.List);
|
||||||
if (mainIndex == -1)
|
if (mainIndex == -1)
|
||||||
{
|
{
|
||||||
|
@ -247,7 +250,7 @@ namespace ET
|
||||||
}
|
}
|
||||||
|
|
||||||
byte key = starSoulEquipAttributeTypeConfig.AttributeTypeArr[mainIndex].Key;
|
byte key = starSoulEquipAttributeTypeConfig.AttributeTypeArr[mainIndex].Key;
|
||||||
long Id= StarSoulAttributeConfigCategory.Instance.GetMainValue(qualityInt, key);
|
long Id = StarSoulAttributeConfigCategory.Instance.GetMainValue(qualityInt, key);
|
||||||
|
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
@ -264,6 +267,12 @@ namespace ET
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static StarSoulItem GenerateStarSoulItem(int typeId, Quality starQuality = Quality.Common)
|
||||||
|
{
|
||||||
|
EquipType equipType = (EquipType) RandomHelper.RandomNumber(0, 12);
|
||||||
|
return GenerateStarSoulItem(equipType, typeId, starQuality);
|
||||||
|
}
|
||||||
|
|
||||||
private static void AddStarSoulViceAttribute(StarSoulItem starSoulItem, List<KeyValuePair<AttributeType, long>> list,
|
private static void AddStarSoulViceAttribute(StarSoulItem starSoulItem, List<KeyValuePair<AttributeType, long>> list,
|
||||||
ListComponent<long> listComponent, int index
|
ListComponent<long> listComponent, int index
|
||||||
)
|
)
|
||||||
|
@ -288,8 +297,9 @@ namespace ET
|
||||||
|
|
||||||
public static float GetRealMainValue(float oldValue, byte level)
|
public static float GetRealMainValue(float oldValue, byte level)
|
||||||
{
|
{
|
||||||
return oldValue*MathF.Pow(mainAddCoe, level);
|
return oldValue * MathF.Pow(mainAddCoe, level);
|
||||||
}
|
}
|
||||||
|
|
||||||
private const float mainAddCoe = 1.1f;
|
private const float mainAddCoe = 1.1f;
|
||||||
private const float reduceCoe = 0.8f;
|
private const float reduceCoe = 0.8f;
|
||||||
private const float reduceCoe1 = 0.6f;
|
private const float reduceCoe1 = 0.6f;
|
||||||
|
@ -329,7 +339,7 @@ namespace ET
|
||||||
/// <param name="attributeCount"></param>
|
/// <param name="attributeCount"></param>
|
||||||
public static void UpgradeStarSoulItemVice(StarSoulItem item, int attributeCount)
|
public static void UpgradeStarSoulItemVice(StarSoulItem item, int attributeCount)
|
||||||
{
|
{
|
||||||
int index = RandomHelper.RandomNumber(0,attributeCount);
|
int index = RandomHelper.RandomNumber(0, attributeCount);
|
||||||
//强化第index个副属性
|
//强化第index个副属性
|
||||||
float add = item.addViceCount switch
|
float add = item.addViceCount switch
|
||||||
{
|
{
|
||||||
|
|
|
@ -495,8 +495,24 @@ namespace ET
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="self"></param>
|
||||||
|
/// <param name="configId">100101</param>
|
||||||
|
/// <returns></returns>
|
||||||
public static string GetStarSoulItemByFragment(this StarSoulBag self, int configId)
|
public static string GetStarSoulItemByFragment(this StarSoulBag self, int configId)
|
||||||
{
|
{
|
||||||
|
EquipType equipType = 0;
|
||||||
|
if (configId > 9999)
|
||||||
|
{
|
||||||
|
equipType = (EquipType) (configId % 100);
|
||||||
|
configId /= 100;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
equipType = (EquipType) RandomHelper.RandomNumber(0, 12);
|
||||||
|
}
|
||||||
const int itemId =20283;
|
const int itemId =20283;
|
||||||
const int count = 30;
|
const int count = 30;
|
||||||
if (BagHelper.GetName(itemId)!="星魂碎片")
|
if (BagHelper.GetName(itemId)!="星魂碎片")
|
||||||
|
@ -515,7 +531,7 @@ namespace ET
|
||||||
return "系统错误!";
|
return "系统错误!";
|
||||||
}
|
}
|
||||||
BagHelper.DeleteItem(self.Parent,itemId,count);
|
BagHelper.DeleteItem(self.Parent,itemId,count);
|
||||||
StarSoulItem item= ItemHelper.GenerateStarSoulItem((int) soulTypeConfig.Id, Quality.Ulti);
|
StarSoulItem item= ItemHelper.GenerateStarSoulItem(equipType,(int) soulTypeConfig.Id, Quality.Ulti);
|
||||||
self.Add(item);
|
self.Add(item);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -42,6 +42,7 @@ namespace ET
|
||||||
public FUI_ComboBox m_comBoxViceAttribute;
|
public FUI_ComboBox m_comBoxViceAttribute;
|
||||||
public FUI_ComboBox m_comBoxGetStarSoul;
|
public FUI_ComboBox m_comBoxGetStarSoul;
|
||||||
public FUI_ButtonOnlyText m_btnGetStarSoul;
|
public FUI_ButtonOnlyText m_btnGetStarSoul;
|
||||||
|
public FUI_ComboBox m_comBoxGetStarSoulPosType;
|
||||||
public Transition m_Effect;
|
public Transition m_Effect;
|
||||||
public const string URL = "ui://71ktouo7f0oatmn";
|
public const string URL = "ui://71ktouo7f0oatmn";
|
||||||
|
|
||||||
|
@ -134,6 +135,7 @@ namespace ET
|
||||||
m_comBoxViceAttribute = FUI_ComboBox.Create(domain,com.GetChildAt(21));
|
m_comBoxViceAttribute = FUI_ComboBox.Create(domain,com.GetChildAt(21));
|
||||||
m_comBoxGetStarSoul = FUI_ComboBox.Create(domain,com.GetChildAt(25));
|
m_comBoxGetStarSoul = FUI_ComboBox.Create(domain,com.GetChildAt(25));
|
||||||
m_btnGetStarSoul = FUI_ButtonOnlyText.Create(domain,com.GetChildAt(26));
|
m_btnGetStarSoul = FUI_ButtonOnlyText.Create(domain,com.GetChildAt(26));
|
||||||
|
m_comBoxGetStarSoulPosType = FUI_ComboBox.Create(domain,com.GetChildAt(27));
|
||||||
m_Effect = com.GetTransitionAt(0);
|
m_Effect = com.GetTransitionAt(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -171,6 +173,8 @@ public override void Dispose()
|
||||||
m_comBoxGetStarSoul.Dispose();
|
m_comBoxGetStarSoul.Dispose();
|
||||||
m_comBoxGetStarSoul = null;
|
m_comBoxGetStarSoul = null;
|
||||||
m_btnGetStarSoul = null;
|
m_btnGetStarSoul = null;
|
||||||
|
m_comBoxGetStarSoulPosType.Dispose();
|
||||||
|
m_comBoxGetStarSoulPosType = null;
|
||||||
m_Effect = null;
|
m_Effect = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,9 +41,12 @@ namespace ET
|
||||||
private Quality sortQuality = Quality.Common;
|
private Quality sortQuality = Quality.Common;
|
||||||
private EquipType equipType = EquipType.武器;
|
private EquipType equipType = EquipType.武器;
|
||||||
private AttributeType mainAttribute = AttributeType.无;
|
private AttributeType mainAttribute = AttributeType.无;
|
||||||
|
|
||||||
private AttributeType viceAttribute = AttributeType.无;
|
private AttributeType viceAttribute = AttributeType.无;
|
||||||
|
|
||||||
//兑换
|
//兑换
|
||||||
private int selectStarSoulitemType = 0;
|
private int selectStarSoulitemType = 0;
|
||||||
|
private EquipType selectGetStarSoulPosType = 0;
|
||||||
|
|
||||||
private List<long> list = new List<long>();
|
private List<long> list = new List<long>();
|
||||||
private LinkedList<StarSoulItem> tempList = new LinkedList<StarSoulItem>();
|
private LinkedList<StarSoulItem> tempList = new LinkedList<StarSoulItem>();
|
||||||
|
@ -186,19 +189,26 @@ namespace ET
|
||||||
{
|
{
|
||||||
this.ui.m_comBoxGetStarSoul.self.items[i] = starSoulTypeArr[i]?.Name;
|
this.ui.m_comBoxGetStarSoul.self.items[i] = starSoulTypeArr[i]?.Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.ui.m_comBoxGetStarSoul.self.onChanged.Set(GetStarSoulChange);
|
this.ui.m_comBoxGetStarSoul.self.onChanged.Set(GetStarSoulChange);
|
||||||
|
arr = Enum.GetNames(typeof (EquipType));
|
||||||
|
this.ui.m_comBoxGetStarSoulPosType.self.items = arr;
|
||||||
|
this.ui.m_comBoxGetStarSoulPosType.self.onChanged.Set(GetStarSoulPosTypeChange);
|
||||||
this.ui.m_btnGetStarSoul.self.onClick.Set(GetStarSoulItem);
|
this.ui.m_btnGetStarSoul.self.onClick.Set(GetStarSoulItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GetStarSoulItem()
|
private void GetStarSoulItem()
|
||||||
{
|
{
|
||||||
StarSoulTypeConfig config = StarSoulTypeConfigCategory.Instance.GetByIndex(this.selectStarSoulitemType);
|
StarSoulTypeConfig config = StarSoulTypeConfigCategory.Instance.GetByIndex(this.selectStarSoulitemType);
|
||||||
if (config == null) return ;
|
if (config == null) return;
|
||||||
SessionComponentHelper.TipCall(this.zoneScene, "是否花费个30星魂碎片兑换1个选定类型的随机天工星魂?", new C2M_GetStarSoulItem() { configId = (int) config.Id },
|
SessionComponentHelper.TipCall(this.zoneScene, "是否花费个30星魂碎片兑换1个选定类型的随机天工星魂?",
|
||||||
(M2C_GetStarSoulItem ret) =>
|
new C2M_GetStarSoulItem() { configId = (int) config.Id * 100 + (int) this.selectGetStarSoulPosType },
|
||||||
{
|
(M2C_GetStarSoulItem ret) => { TipHelper.OpenUI("兑换成功"); });
|
||||||
TipHelper.OpenUI("兑换成功");
|
}
|
||||||
});
|
|
||||||
|
private void GetStarSoulPosTypeChange()
|
||||||
|
{
|
||||||
|
selectGetStarSoulPosType = (EquipType) this.ui.m_comBoxGetStarSoulPosType.self.selectedIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GetStarSoulChange()
|
private void GetStarSoulChange()
|
||||||
|
@ -314,7 +324,7 @@ namespace ET
|
||||||
this.list.Add(item.Id);
|
this.list.Add(item.Id);
|
||||||
}
|
}
|
||||||
else if (CheckMainAttribute() && CheckViceAttribute())
|
else if (CheckMainAttribute() && CheckViceAttribute())
|
||||||
this.list.Add(item.Id);
|
this.list.Add(item.Id);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CheckMainAttribute()
|
bool CheckMainAttribute()
|
||||||
|
|
|
@ -22,7 +22,7 @@ MonoBehaviour:
|
||||||
PrefabModifications: []
|
PrefabModifications: []
|
||||||
SerializationNodes: []
|
SerializationNodes: []
|
||||||
ClientVersion: 2.3
|
ClientVersion: 2.3
|
||||||
IsEditorMode: 1
|
IsEditorMode: 0
|
||||||
IsLocal: 1
|
IsLocal: 1
|
||||||
LocalResPath: http://127.0.0.1:2085/
|
LocalResPath: http://127.0.0.1:2085/
|
||||||
LocalServerPath: 127.0.0.1:7756
|
LocalServerPath: 127.0.0.1:7756
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -29,7 +29,7 @@ MonoBehaviour:
|
||||||
searchPatternPrefab: '*.prefab'
|
searchPatternPrefab: '*.prefab'
|
||||||
searchPatternScene: '*.unity'
|
searchPatternScene: '*.unity'
|
||||||
searchPatternText: '*.txt,*.bytes,*.json,*.csv,*.xml,*htm,*.html,*.yaml,*.fnt'
|
searchPatternText: '*.txt,*.bytes,*.json,*.csv,*.xml,*htm,*.html,*.yaml,*.fnt'
|
||||||
version: 390
|
version: 393
|
||||||
scenesInBuild:
|
scenesInBuild:
|
||||||
- {fileID: 102900000, guid: e0d691ac8c1d0454ba07089ea820e18a, type: 3}
|
- {fileID: 102900000, guid: e0d691ac8c1d0454ba07089ea820e18a, type: 3}
|
||||||
- {fileID: 102900000, guid: d378f07356e960549add8141397b1462, type: 3}
|
- {fileID: 102900000, guid: d378f07356e960549add8141397b1462, type: 3}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://121.196.171.57:2085/", "Address" : "121.196.171.57:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2085/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : true, "ClientVersion" : "2.3" }
|
{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://121.196.171.57:2085/", "Address" : "121.196.171.57:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2085/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : false, "ClientVersion" : "2.3" }
|
|
@ -11,130 +11,130 @@ EditorBuildSettings:
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Res/Common/Splash.unity
|
path: Assets/Res/Common/Splash.unity
|
||||||
guid: d378f07356e960549add8141397b1462
|
guid: d378f07356e960549add8141397b1462
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_ActiveTask.unity
|
path: Assets/Download/Scenes/Scene_ActiveTask.unity
|
||||||
guid: 45280bed83d2e344590ce61ace27b83c
|
guid: 45280bed83d2e344590ce61ace27b83c
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_BattleIdle.unity
|
path: Assets/Download/Scenes/Scene_BattleIdle.unity
|
||||||
guid: ae137edf722298941944efba11422c1d
|
guid: ae137edf722298941944efba11422c1d
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Beach.unity
|
path: Assets/Download/Scenes/Scene_Beach.unity
|
||||||
guid: d46ff12dcf1834b4dad6ddfe45458e65
|
guid: d46ff12dcf1834b4dad6ddfe45458e65
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Boss.unity
|
path: Assets/Download/Scenes/Scene_Boss.unity
|
||||||
guid: dd04855bd8f8a8c4083a5f4482ac7258
|
guid: dd04855bd8f8a8c4083a5f4482ac7258
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Challenge.unity
|
path: Assets/Download/Scenes/Scene_Challenge.unity
|
||||||
guid: 01f636e71f5382b4687e608ccd7c47e6
|
guid: 01f636e71f5382b4687e608ccd7c47e6
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_CreateRole.unity
|
path: Assets/Download/Scenes/Scene_CreateRole.unity
|
||||||
guid: 6f3aa9ba25869814fb05cf1fe1cab8ff
|
guid: 6f3aa9ba25869814fb05cf1fe1cab8ff
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_EnterGame.unity
|
path: Assets/Download/Scenes/Scene_EnterGame.unity
|
||||||
guid: b6b5bad50076adc4d9a975c98327a073
|
guid: b6b5bad50076adc4d9a975c98327a073
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_FimalyBattle.unity
|
path: Assets/Download/Scenes/Scene_FimalyBattle.unity
|
||||||
guid: b03d5f9f8d2f95d4c894089ad4840c60
|
guid: b03d5f9f8d2f95d4c894089ad4840c60
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_GuardianPark.unity
|
path: Assets/Download/Scenes/Scene_GuardianPark.unity
|
||||||
guid: dfdfb988ae306cc4699ad910ce5f5f82
|
guid: dfdfb988ae306cc4699ad910ce5f5f82
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_HonorTemple.unity
|
path: Assets/Download/Scenes/Scene_HonorTemple.unity
|
||||||
guid: 6a434142803416748a830775403bb331
|
guid: 6a434142803416748a830775403bb331
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Login.unity
|
path: Assets/Download/Scenes/Scene_Login.unity
|
||||||
guid: 30dd40811005c814f807648e46cb03ed
|
guid: 30dd40811005c814f807648e46cb03ed
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainCity.unity
|
path: Assets/Download/Scenes/Scene_MainCity.unity
|
||||||
guid: 5ea4281985825f54c844f0404bedb358
|
guid: 5ea4281985825f54c844f0404bedb358
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory1.unity
|
path: Assets/Download/Scenes/Scene_MainStory1.unity
|
||||||
guid: c57b27b08ffaa8a4f91a15c02d5de805
|
guid: c57b27b08ffaa8a4f91a15c02d5de805
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory2.unity
|
path: Assets/Download/Scenes/Scene_MainStory2.unity
|
||||||
guid: 99b174b0ca8cbf048a57ef0576a69da0
|
guid: 99b174b0ca8cbf048a57ef0576a69da0
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory3.unity
|
path: Assets/Download/Scenes/Scene_MainStory3.unity
|
||||||
guid: e13303a3e71f0f84fb7f9070100ac6e4
|
guid: e13303a3e71f0f84fb7f9070100ac6e4
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory4.unity
|
path: Assets/Download/Scenes/Scene_MainStory4.unity
|
||||||
guid: 52af5cd6587f9da4ba46b77e0e94ffe8
|
guid: 52af5cd6587f9da4ba46b77e0e94ffe8
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory5.unity
|
path: Assets/Download/Scenes/Scene_MainStory5.unity
|
||||||
guid: 610bb772748d9e14b900c143561e8aaa
|
guid: 610bb772748d9e14b900c143561e8aaa
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory6.unity
|
path: Assets/Download/Scenes/Scene_MainStory6.unity
|
||||||
guid: 47d839d999f6edc41a9f70755023b7e8
|
guid: 47d839d999f6edc41a9f70755023b7e8
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory7.unity
|
path: Assets/Download/Scenes/Scene_MainStory7.unity
|
||||||
guid: 9d72f13296e57cd4ab4452b6e96a7a87
|
guid: 9d72f13296e57cd4ab4452b6e96a7a87
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory8.unity
|
path: Assets/Download/Scenes/Scene_MainStory8.unity
|
||||||
guid: e4c4febf70bcd034099ac0ed0ba69d24
|
guid: e4c4febf70bcd034099ac0ed0ba69d24
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory9.unity
|
path: Assets/Download/Scenes/Scene_MainStory9.unity
|
||||||
guid: 782d2e6a67496b442b64d76a0d3989c0
|
guid: 782d2e6a67496b442b64d76a0d3989c0
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory10.unity
|
path: Assets/Download/Scenes/Scene_MainStory10.unity
|
||||||
guid: 4203f3f88fec5654f909cbe5982fcb9c
|
guid: 4203f3f88fec5654f909cbe5982fcb9c
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory11.unity
|
path: Assets/Download/Scenes/Scene_MainStory11.unity
|
||||||
guid: 31ac6240fd8b27444b56b6f62de91781
|
guid: 31ac6240fd8b27444b56b6f62de91781
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory12.unity
|
path: Assets/Download/Scenes/Scene_MainStory12.unity
|
||||||
guid: eb554d641fba0f8409680b8f8d0b9d5e
|
guid: eb554d641fba0f8409680b8f8d0b9d5e
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory13.unity
|
path: Assets/Download/Scenes/Scene_MainStory13.unity
|
||||||
guid: 3531d4659f140034d9263756f5f58a6c
|
guid: 3531d4659f140034d9263756f5f58a6c
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory14.unity
|
path: Assets/Download/Scenes/Scene_MainStory14.unity
|
||||||
guid: 56cf57dd7aea50d489258cd408bd6520
|
guid: 56cf57dd7aea50d489258cd408bd6520
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory15.unity
|
path: Assets/Download/Scenes/Scene_MainStory15.unity
|
||||||
guid: 7961e32a2d901654787d54b8fb764e23
|
guid: 7961e32a2d901654787d54b8fb764e23
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MainStory16.unity
|
path: Assets/Download/Scenes/Scene_MainStory16.unity
|
||||||
guid: 5e537e3afb972e44baed795a51cbe939
|
guid: 5e537e3afb972e44baed795a51cbe939
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_SpaceTravel.unity
|
path: Assets/Download/Scenes/Scene_SpaceTravel.unity
|
||||||
guid: 287d198c9a3c048258470a9336253cc5
|
guid: 287d198c9a3c048258470a9336253cc5
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_StarSoul.unity
|
path: Assets/Download/Scenes/Scene_StarSoul.unity
|
||||||
guid: a8e745dfd7e2d434a925d37781af77f5
|
guid: a8e745dfd7e2d434a925d37781af77f5
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_WorldBoss.unity
|
path: Assets/Download/Scenes/Scene_WorldBoss.unity
|
||||||
guid: 9268d7a39379947e3b8cba62bc75d789
|
guid: 9268d7a39379947e3b8cba62bc75d789
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_MarvellousSquare.unity
|
path: Assets/Download/Scenes/Scene_MarvellousSquare.unity
|
||||||
guid: 1e11547db33b2ee439e611d01dcc9f0d
|
guid: 1e11547db33b2ee439e611d01dcc9f0d
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Pve.unity
|
path: Assets/Download/Scenes/Scene_Pve.unity
|
||||||
guid: e415bacbb0283f24baca2c264f9ccfd1
|
guid: e415bacbb0283f24baca2c264f9ccfd1
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_PersonalPvp1.unity
|
path: Assets/Download/Scenes/Scene_PersonalPvp1.unity
|
||||||
guid: 0e3f95dffb62df641b220bf8ccc1b7f8
|
guid: 0e3f95dffb62df641b220bf8ccc1b7f8
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_PersonalPvp2.unity
|
path: Assets/Download/Scenes/Scene_PersonalPvp2.unity
|
||||||
guid: 9ccf7a60ffac9be4ab3263a3b67cf9bf
|
guid: 9ccf7a60ffac9be4ab3263a3b67cf9bf
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_PersonalPvp3.unity
|
path: Assets/Download/Scenes/Scene_PersonalPvp3.unity
|
||||||
guid: 5f618dca93745264f8fb5261621a3bcb
|
guid: 5f618dca93745264f8fb5261621a3bcb
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_ManulEquip1.unity
|
path: Assets/Download/Scenes/Scene_ManulEquip1.unity
|
||||||
guid: cb98f349f62e32d45a0a8ef57a0b6633
|
guid: cb98f349f62e32d45a0a8ef57a0b6633
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_ManulEquip2.unity
|
path: Assets/Download/Scenes/Scene_ManulEquip2.unity
|
||||||
guid: 8981e7a1731d15c4caa1479fb37223c4
|
guid: 8981e7a1731d15c4caa1479fb37223c4
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_ManulEquip3.unity
|
path: Assets/Download/Scenes/Scene_ManulEquip3.unity
|
||||||
guid: aab02a6706a731043add237eab876f6c
|
guid: aab02a6706a731043add237eab876f6c
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_PersonalBoss.unity
|
path: Assets/Download/Scenes/Scene_PersonalBoss.unity
|
||||||
guid: e971fbe570ac7284baffa4db1e8b7cbc
|
guid: e971fbe570ac7284baffa4db1e8b7cbc
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Challenge_Middle.unity
|
path: Assets/Download/Scenes/Scene_Challenge_Middle.unity
|
||||||
guid: 2d2d745676fe74945894a6d128bd1851
|
guid: 2d2d745676fe74945894a6d128bd1851
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Download/Scenes/Scene_Challenge_Hard.unity
|
path: Assets/Download/Scenes/Scene_Challenge_Hard.unity
|
||||||
guid: 2c493ca3d57147a41b50962f3e421e56
|
guid: 2c493ca3d57147a41b50962f3e421e56
|
||||||
m_configObjects:
|
m_configObjects:
|
||||||
|
|
Loading…
Reference in New Issue