Cal
/
CTT
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改星魂掉落保底

develope
Cal 2021-05-02 01:19:35 +08:00
parent 314c0359a0
commit 074d3c48a0
35 changed files with 1839 additions and 1596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FUI_UserData/CTT/assets/Bag/StarSoulBagUI.xml
View File

@ -4,7 +4,7 @@
<component id="n0_fyvb" name="frame" src="fyvbr" fileName="FrameBag.xml" xy="0,0" group="n18_fyvb">
<Label title="星魂背包"/>
</component>
<list id="n1_fyvb" name="slotList" xy="76,121" size="447,315" group="n18_fyvb" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" clipSoftness="0,50" lineGap="1" colGap="2" defaultItem="ui://kqsmrpxlfyvbs" autoClearItems="true">
<list id="n1_fyvb" name="slotList" xy="81,116" size="440,324" group="n18_fyvb" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" scrollBarFlags="1024" clipSoftness="0,50" lineGap="2" colGap="3" defaultItem="ui://kqsmrpxlfyvbs" autoClearItems="true">
<item/>
<item/>
<item/>

2
FUI_UserData/CTT/assets/Dialog/Tab/TabUI.xml
View File

@ -4,7 +4,7 @@
<image id="n0_p2c6" name="n0" src="ozr3ii" fileName="Assets/Common_Equiptips.png" pkg="kqsmrpxl" xy="0,0" size="280,334" group="n2_p2c6">
<relation target="n1_p2c6" sidePair="height-height"/>
</image>
<richtext id="n1_p2c6" name="title" xy="11,9" size="258,315" group="n2_p2c6" touchable="false" fontSize="16" color="#ffffff" leading="1" ubb="true" autoSize="height" strokeColor="#000000" autoClearText="true" text="[color=#00ff00][size=22]足球[/size][/color]&#xA;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&#xA;装备&#x9;&#x9;&#x9;&#x9;形象&#xA;单价: 99&lt;img src=&apos;ui://Common/Common_Coin_Jinbi&apos; /&gt; 99&lt;img src=&apos;ui://Common/Common_Coin_Yinbi&apos; /&gt; 99&lt;img src=&apos;ui://Common/Common_Coin_Tongbi&apos; /&gt;&#xA;[color=#ff99cc]已绑定[/color]&#xA;需要等级:1&#xA;需要职业:全部&#xA;[color=#99bf88]攻击:5600[/color][color=#99cc33]55[/color]&#xA;[color=#99bf88]防御:6000[/color]&#xA;[color=#99bf88]拜祭:6%[/color]&#xA;[img]ui://kqsmrpxlp2c66p[/img][color=#e9d099]敏捷:100[/color]&#xA;[img]ui://kqsmrpxlp2c66q[/img]&#xA;[img]ui://kqsmrpxlp2c66q[/img]&#xA;[img]ui://kqsmrpxlp2c66q[/img]&#xA;[color=#ffff99]该物品价值1200RMB，买商城可以兑换很多很多钱[/color]"/>
<richtext id="n1_p2c6" name="title" xy="11,9" size="258,316" group="n2_p2c6" touchable="false" fontSize="16" color="#ffffff" leading="1" ubb="true" autoSize="height" strokeColor="#000000" autoClearText="true" text="[color=#ff0000][size=22]足球[/size][/color]&#xA;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&lt;img src=&apos;ui://Common/Common_star&apos; /&gt;&#xA;装备&#x9;&#x9;&#x9;&#x9;形象&#xA;单价: 99&lt;img src=&apos;ui://Common/Common_Coin_Jinbi&apos; /&gt; 99&lt;img src=&apos;ui://Common/Common_Coin_Yinbi&apos; /&gt; 99&lt;img src=&apos;ui://Common/Common_Coin_Tongbi&apos; /&gt;&#xA;[color=#ff99cc]已绑定[/color]&#xA;需要等级:1&#xA;需要职业:全部&#xA;[color=#99bf88]攻击:5600[/color][color=#99cc33]55[/color]&#xA;[color=#99bf88]防御:6000[/color]&#xA;[color=#99bf88]拜祭:6%[/color]&#xA;[img]ui://kqsmrpxlp2c66p[/img][color=#e9d099]敏捷:100[/color]&#xA;[img]ui://kqsmrpxlp2c66q[/img]&#xA;[img]ui://kqsmrpxlp2c66q[/img]&#xA;[img]ui://kqsmrpxlp2c66q[/img]&#xA;[color=#ffff99]该物品价值1200RMB，买商城可以兑换很多很多钱[/color]"/>
<group id="n2_p2c6" name="group" xy="0,0" size="280,334" advanced="true"/>
</displayList>
<relation target="n0_p2c6" sidePair="width-width,height-height"/>

7
Proto/OuterMessage.proto
View File

@ -2933,3 +2933,10 @@ message M2C_GetStarSoulBag // IActorLocationResponse
string Message = 92;
repeated StarSoulNetItem itemList=1;
}
message M2C_SyncStarSoulBag // IActorMessage
{
int32 RpcId = 90;
int64 ActorId = 93;
int64 Id =1;
StarSoulNetItem item=2;
}

24
Server/Hotfix/Game/Common/GlobalMethod.cs
View File

@ -454,12 +454,12 @@ namespace ET
Log.Info(team.GetMemberName() + $"{self.battleType}胜利了！");
UnitScene unitScene = unit.GetComponent<UnitScene>();
int mapId = unitScene.MapId;
if (mapId % 100 != 6)
{
//减少旅行券
PlayerData data = unit.GetComponent<PlayerData>();
data.travelVoucher--;
}
// if (mapId % 100 != 6)
// {
// //减少旅行券
// PlayerData data = unit.GetComponent<PlayerData>();
// data.travelVoucher--;
// }
await TimerComponent.Instance.WaitAsync(5000L);
MessageHelper.SendActor(unit, new M2C_BattleVictory { BattleType = (int) self.battleType });
@ -519,12 +519,12 @@ namespace ET
int mapId = unitScene.MapId;
if (unit.UnitType == UnitType.Player)
Log.Info($"{team.GetMemberName()} {self.battleType}失败了！");
if (mapId % 100 != 6)
{
//减少旅行券
PlayerData data = unit.GetComponent<PlayerData>();
data.travelVoucher--;
}
// if (mapId % 100 != 6)
// {
// //减少旅行券
// PlayerData data = unit.GetComponent<PlayerData>();
// data.travelVoucher--;
// }
await TimerComponent.Instance.WaitAsync(5500);
await BattleHelper.DefeatOption(self, team);

17
Server/Hotfix/Game/Handler/Map/C2M_RequestEnterMapHandler.cs
View File

@ -1,6 +1,7 @@
using ET;
using Cal.DataTable;
using System;
using System.Collections.Generic;
using System.Net;
namespace ET
@ -199,6 +200,22 @@ namespace ET
//
break;
}
case UnitSceneType.SpaceTravel:
{
LinkedList<Unit> teamList = team.GetUnits();
foreach (Unit u in teamList)
{
PlayerData _data = u.GetComponent<PlayerData>();
if (_data == null)
{
Log.Error($"data == null where id = {u?.Id}");
continue;
}
_data.travelVoucher--;
}
}
break;
}
reply();
EventSystem eventSystem2 = Game.EventSystem;

48
Server/Hotfix/Game/Helper/GMTool.cs
View File

@ -120,30 +120,6 @@ namespace ET
return "成功";
}
else
if (cmdType.Equals("addStarSoulItem", StringComparison.OrdinalIgnoreCase))
{
if (!AppConfig.inst.isTest)
return "测试服专用";
foreach (Unit u in MapUnitComponent.Instance.GetAll())
{
try
{
if (u.UnitType == UnitType.Player)
{
var item= ItemHelper.GenerateStarSoulItem();
StarSoulBag bag = u.GetComponent<StarSoulBag>();
bag.Add(item);
}
}
catch (Exception e)
{
Log.Error($"unit id is {u.Id}");
Log.Error(e);
}
}
return "成功";
}
else
if (cmdType.Equals("requireStore", StringComparison.OrdinalIgnoreCase))
{
List<Store> list = await DBComponent.Instance.QueryJson<Store>("{}");
@ -292,6 +268,30 @@ namespace ET
});
}
else
if (cmdType.Equals("addStarSoulItem", StringComparison.OrdinalIgnoreCase))
{
if (!AppConfig.inst.isTest)
return "测试服专用";
foreach (Unit u in MapUnitComponent.Instance.GetAll())
{
try
{
if (u.UnitType == UnitType.Player)
{
var item= ItemHelper.GenerateStarSoulItem((Quality) value);
StarSoulBag bag = u.GetComponent<StarSoulBag>();
bag.Add(item);
}
}
catch (Exception e)
{
Log.Error($"unit id is {u.Id}");
Log.Error(e);
}
}
return "成功";
}
else
if (cmdType.Equals("addPetExp", StringComparison.OrdinalIgnoreCase))
{
Pet pet = unit.GetComponent<Pet>();

34
Server/Hotfix/Game/Helper/ItemHelper.cs
View File

@ -173,10 +173,6 @@ namespace ET
static readonly List<int> starSoulQualityWeightList = new()
{
0,
3000,
800,
128,
32,
4,
1
@ -191,7 +187,7 @@ namespace ET
1
};
public static StarSoulItem GenerateStarSoulItem()
public static StarSoulItem GenerateStarSoulItem(Quality starQuality = Quality.Common)
{
StarSoulItem item = new();
item.typeId = 1001;
@ -200,6 +196,7 @@ namespace ET
int qualityInt = RandomHelper.RandomByWeight(starSoulQualityWeightList);
if (qualityInt == -1)
return null;
qualityInt = (int) (starQuality + (byte) qualityInt);
Quality quality = (Quality) qualityInt;
item.quality = quality;
item.Id = Game.IdGenerater.GenerateId();
@ -253,21 +250,36 @@ namespace ET
{
int count = RandomHelper.RandomByWeight(starSoulViceCountWeight);
var list = StarSoulAttributeConfigCategory.Instance.viceKeyList;
using var listComponent=ListComponent<long>.Create();
for (int i = 0; i < count; i++)
{
int index = RandomHelper.RandomByWeight(StarSoulAttributeConfigCategory.Instance.viceWeigt);
if (index >= list.Count)
long id = 0;
do
{
Log.Error($"{index}>{list.Count}");
return;
}
int index = RandomHelper.RandomByWeight(StarSoulAttributeConfigCategory.Instance.viceWeigt);
if (index >= list.Count)
{
Log.Error($"{index}>{list.Count}");
return;
}
long id = list[index].Value;
id = list[index].Value;
}
while (listComponent.List.Contains(id));
listComponent.List.Add(id);
starSoulItem.viceIds[i] = (int) id;
}
}
}
private const float reduceCoe = 0.8f;
public static float GetRealViceValue(float oldValue, Quality quality) => quality switch
{
>=Quality.Legendary=>oldValue,
>=Quality.Rare=>oldValue*reduceCoe,
<=Quality.UnCommon => oldValue * (reduceCoe*reduceCoe),
};
public static float GetRandom()
{
return GetRandom(randomMax);

6
Server/Hotfix/Game/System/Bag/EquipItemSystem.cs
View File

@ -304,11 +304,11 @@ namespace ET
StarSoulAttributeConfig soulAttributeConfig = StarSoulAttributeConfigCategory.Instance.Get(item.mainId);
if (soulAttributeConfig.Key == (int) type)
value += soulAttributeConfig.Value;
foreach (var kv in item.viceIds)
for (var i = 0; i < item.viceIds.Length; i++)
{
soulAttributeConfig = StarSoulAttributeConfigCategory.Instance.Get(kv);
soulAttributeConfig = StarSoulAttributeConfigCategory.Instance.Get(item.viceIds[i]);
if (soulAttributeConfig.Key == (int) type)
value += soulAttributeConfig.Value;
value += ItemHelper.GetRealViceValue(soulAttributeConfig.Value*(1+item.viceAdd[i]),item.quality);
}
}
}

39
Server/Hotfix/Game/System/Bag/StarSoulBagSystem.cs
View File

@ -31,7 +31,7 @@ namespace ET
{
public static void InitData(this StarSoulBag self)
{
#if UNITY
#if UNITY
GetDataFromServer(self);
#endif
@ -52,17 +52,19 @@ namespace ET
}
self.ItemCount++;
self.Sync(item.Id, item);
return null;
}
public static bool Remove(this StarSoulBag self, long Id)
{
if(! self.itemDic.Remove(Id))
if (!self.itemDic.Remove(Id))
{
return false;
}
self.ItemCount--;
self.Sync(Id, null);
return true;
}
@ -72,7 +74,40 @@ namespace ET
{
return null;
}
return itemBase;
}
private static void Sync(this StarSoulBag self, long Id, StarSoulItem item)
{
M2C_SyncStarSoulBag proto = new();
StarSoulNetItem netItem = new StarSoulNetItem();
if (item == null)
{
netItem.Id = 0;
}
netItem.Id = item.Id;
netItem.level = item.level;
netItem.exp = item.exp;
netItem.quality = (int) item.quality;
netItem.posType = (int) item.posType;
netItem.typeId = item.typeId;
netItem.isUsed = item.isUsed;
netItem.main = item.mainId;
foreach (int id in item.viceIds)
{
netItem.vice.Add(id);
}
foreach (float id in item.viceAdd)
{
netItem.viceAdd.Add(id);
}
proto.Id = Id;
proto.item = netItem;
MessageHelper.SendActor(self.GetParent<Unit>(), proto);
}
}
}

3
Server/Hotfix/Game/System/Map/MapSceneSystem.cs
View File

@ -88,7 +88,8 @@ namespace ET
using (var listComponent = ListComponent<Unit>.Create())
{
IEnumerable<Unit> unitList = self.GetTierAll(tierId);
listComponent.List.AddRange(unitList);
if (unitList != null)
listComponent.List.AddRange(unitList);
//广播
foreach (Unit u in listComponent.List)

18
Server/Model/Generate/Message/OuterMessage.cs
View File

@ -7027,4 +7027,22 @@ namespace ET
}
[Message(OuterOpcode.M2C_SyncStarSoulBag)]
[ProtoContract]
public partial class M2C_SyncStarSoulBag:IActorMessage
{
[ProtoMember(90)]
public int RpcId { get; set; }
[ProtoMember(93)]
public long ActorId { get; set; }
[ProtoMember(1)]
public long Id { get; set; }
[ProtoMember(2)]
public StarSoulNetItem item { get; set; }
}
}

1
Server/Model/Generate/Message/OuterOpcode.cs
View File

@ -399,5 +399,6 @@ namespace ET
public const ushort StarSoulNetItem = 20395;
public const ushort C2M_GetStarSoulBag = 20396;
public const ushort M2C_GetStarSoulBag = 20397;
public const ushort M2C_SyncStarSoulBag = 20398;
}
}

BIN
Tools/ExcelTool/Excel/StarSoulAttributeConfig.xlsx
View File

Binary file not shown.

BIN
Unity/Assets/Download/Config/Hotfix.dll.bytes
View File

Binary file not shown.

BIN
Unity/Assets/Download/Config/Hotfix.pdb.bytes
View File

Binary file not shown.

BIN
Unity/Assets/Download/Config/HotfixView.dll.bytes
View File

Binary file not shown.

BIN
Unity/Assets/Download/Config/HotfixView.pdb.bytes
View File

Binary file not shown.

BIN
Unity/Assets/Download/FGUI/Bag/Bag_fui.bytes
View File

Binary file not shown.

48
Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/UI/M2C_SyncStarSoulBagHandler.cs Normal file
View File

@ -0,0 +1,48 @@
using ET;
using ET.EventType;
using UnityEngine;
namespace ET
{
[MessageHandler]
public class M2C_SyncStarSoulBagHandler: AMHandler<M2C_SyncStarSoulBag>
{
protected override async ETVoid Run(ET.Session session, M2C_SyncStarSoulBag message)
{
var zoneScene = session.ZoneScene();
StarSoulBag bag = zoneScene.GetComponent<StarSoulBag>();
var item = message.item;
if (item.Id == 0)
{
bag.Remove(message.Id);
return;
}
StarSoulItem starSoulItem = new StarSoulItem()
{
Id = item.Id,
isUsed = item.isUsed,
typeId = item.typeId,
mainAttribute = item.main,
level = (byte) item.level,
exp =item.exp,
posType = (EquipType) item.posType,
quality = (Quality) item.quality,
};
for (var i = 0; i < item.vice.Count; i++)
{
starSoulItem.viceAttribute[i] = item.vice[i];
}
for (var i = 0; i < item.viceAdd.Count; i++)
{
starSoulItem.viceAdd[i] = item.viceAdd[i];
}
var ret=bag.Update(starSoulItem);
if (ret != null)
{
Debug.Log(ret);
}
Game.EventSystem.Publish(new RefreshStarSoulBagUI(){zoneScene =zoneScene });
await ETTask.CompletedTask;
}
}
}

11
Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/UI/M2C_SyncStarSoulBagHandler.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c343ec6fbdca8524f8ab9a20d28f399e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
Unity/Assets/Hotfix/Logic/Behaviour/Game/Helper/ItemHelper.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
namespace ET
{
public static class ItemHelper
{
private const float reduceCoe = 0.8f;
public static float GetRealViceValue(float oldValue, Quality quality) => quality switch
{
var qual when qual >= Quality.Legendary => oldValue,
var qual when qual >= Quality.Rare => oldValue * reduceCoe,
var qual when qual <= Quality.UnCommon => oldValue * (reduceCoe * reduceCoe),
_ => throw new ArgumentOutOfRangeException(nameof (quality), quality, null)
};
}
}

11
Unity/Assets/Hotfix/Logic/Behaviour/Game/Helper/ItemHelper.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 83f0e0f7022259c4688c8511a07592e2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
Unity/Assets/Hotfix/Logic/Behaviour/Game/System/StarSoulBagSystem.cs
View File

@ -98,6 +98,15 @@ namespace ET
self.ItemCount++;
return null;
}
public static string Update(this StarSoulBag self,StarSoulItem item)
{
if (!self.itemDic.ContainsKey(item.Id))
{
return Add(self,item);
}
self.itemDic[item.Id] = item;
return null;
}
public static bool Remove(this StarSoulBag self, long Id)
{

4
Unity/Assets/Hotfix/Logic/Model/Game/Common/EventType.cs
View File

@ -293,6 +293,10 @@ namespace ET
{
public Scene zoneScene;
}
public struct RefreshStarSoulBagUI
{
public Scene zoneScene;
}
public struct TestLog
{
public string msg;

18
Unity/Assets/Hotfix/Logic/Model/Generate/Message/OuterMessage.cs
View File

@ -7027,4 +7027,22 @@ namespace ET
}
[Message(OuterOpcode.M2C_SyncStarSoulBag)]
[ProtoContract]
public partial class M2C_SyncStarSoulBag:IActorMessage
{
[ProtoMember(90)]
public int RpcId { get; set; }
[ProtoMember(93)]
public long ActorId { get; set; }
[ProtoMember(1)]
public long Id { get; set; }
[ProtoMember(2)]
public StarSoulNetItem item { get; set; }
}
}

1
Unity/Assets/Hotfix/Logic/Model/Generate/Message/OuterOpcode.cs
View File

@ -399,5 +399,6 @@ namespace ET
public const ushort StarSoulNetItem = 20395;
public const ushort C2M_GetStarSoulBag = 20396;
public const ushort M2C_GetStarSoulBag = 20397;
public const ushort M2C_SyncStarSoulBag = 20398;
}
}

16
Unity/Assets/HotfixView/Event/UI/RefreshStarSoulBagUIEvent.cs Normal file
View File

@ -0,0 +1,16 @@
using ET.EventType;
namespace ET
{
public class RefreshStarSoulBagUIEvent:AEvent<RefreshStarSoulBagUI>
{
public override async ETTask Run(RefreshStarSoulBagUI args)
{
await ETTask.CompletedTask;
if (FUIComponent.Instance.Get(FUIPackage.Bag_StarSoulBagUI) is FUI_StarSoulBagUI ui )
{
ui.GetComponent<StarSoulBagUI>().ReFresh();
}
}
}
}

11
Unity/Assets/HotfixView/Event/UI/RefreshStarSoulBagUIEvent.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b59514d647a06324c9149dedf29a2765
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Unity/Assets/HotfixView/Helper/TabHelper.cs
View File

@ -908,7 +908,7 @@ namespace ET
if(__id==0)
break;
soulAttributeConfig = StarSoulAttributeConfigCategory.Instance.Get(__id);
sb.AppendLine($"[color=#99bf88]{GetAttributeString((Cal.AttributeType) soulAttributeConfig.Key, soulAttributeConfig.Value*(1+data.viceAdd[i]))}[/color]");
sb.AppendLine($"[color=#99bf88]{GetAttributeString((Cal.AttributeType) soulAttributeConfig.Key, ItemHelper.GetRealViceValue(soulAttributeConfig.Value*(1+data.viceAdd[i]),data.quality))}[/color]");
}

14
Unity/Assets/HotfixView/UI/StarSoulBagUI/StarSoulBagUI.cs
View File

@ -61,19 +61,25 @@ namespace ET
private void OnItemRender(int index, GObject item)
{
var btn = item.asButton;
long id = idList.List[index];
btn.icon = null;
btn.onRollOver.Set(()=>OnRollOver(btn,id));
btn.icon = UIPackage.GetItemURL(FUIPackage.Bag,"120651");
btn.onRollOver.Set(()=>OnRollOver(btn,index));
}
private void OnRollOver(GButton btn,long id)
private void OnRollOver(GButton btn,int index)
{
long id = idList.List[index];
TabHelper.SetTab(btn,()=>TabHelper.OpenStarSoulUI(this.bag, id));
}
public void ReFresh()
{
idList.Dispose();
AwakeAsync().Coroutine();
}
public void Destroy()
{
idList.Dispose();
}
}
}

2
Unity/Assets/Model/Cal/CalAssets/BulildAB.asset
View File

@ -22,7 +22,7 @@ MonoBehaviour:
PrefabModifications: []
SerializationNodes: []
ClientVersion: 2.2
IsEditorMode: 0
IsEditorMode: 1
IsLocal: 1
LocalResPath: http://127.0.0.1:2085/
LocalServerPath: 127.0.0.1:7756

2988
Unity/Assets/Res/Common/Manifest.asset
View File

File diff suppressed because it is too large Load Diff

2
Unity/Assets/Res/Common/Rules.asset
View File

@ -29,7 +29,7 @@ MonoBehaviour:
searchPatternPrefab: '*.prefab'
searchPatternScene: '*.unity'
searchPatternText: '*.txt,*.bytes,*.json,*.csv,*.xml,*htm,*.html,*.yaml,*.fnt'
version: 324
version: 325
scenesInBuild:
- {fileID: 102900000, guid: e0d691ac8c1d0454ba07089ea820e18a, type: 3}
- {fileID: 102900000, guid: d378f07356e960549add8141397b1462, type: 3}

2
Unity/Assets/Res/Config/GlobalProto.txt
View File

@ -1 +1 @@
{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://47.108.114.168:2086/", "Address" : "47.108.114.168:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2085/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : false, "ClientVersion" : "2.2" }
{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://47.108.114.168:2086/", "Address" : "47.108.114.168:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2085/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : true, "ClientVersion" : "2.2" }

78
Unity/ProjectSettings/EditorBuildSettings.asset
View File

@ -11,121 +11,121 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Res/Common/Splash.unity
guid: d378f07356e960549add8141397b1462
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_ActiveTask.unity
guid: 45280bed83d2e344590ce61ace27b83c
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_BattleIdle.unity
guid: ae137edf722298941944efba11422c1d
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Beach.unity
guid: d46ff12dcf1834b4dad6ddfe45458e65
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Boss.unity
guid: dd04855bd8f8a8c4083a5f4482ac7258
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Challenge.unity
guid: 01f636e71f5382b4687e608ccd7c47e6
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_CreateRole.unity
guid: 6f3aa9ba25869814fb05cf1fe1cab8ff
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_EnterGame.unity
guid: b6b5bad50076adc4d9a975c98327a073
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_FimalyBattle.unity
guid: b03d5f9f8d2f95d4c894089ad4840c60
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_GuardianPark.unity
guid: dfdfb988ae306cc4699ad910ce5f5f82
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_HonorTemple.unity
guid: 6a434142803416748a830775403bb331
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Login.unity
guid: 30dd40811005c814f807648e46cb03ed
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainCity.unity
guid: 5ea4281985825f54c844f0404bedb358
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory1.unity
guid: c57b27b08ffaa8a4f91a15c02d5de805
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory2.unity
guid: 99b174b0ca8cbf048a57ef0576a69da0
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory3.unity
guid: e13303a3e71f0f84fb7f9070100ac6e4
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory4.unity
guid: 52af5cd6587f9da4ba46b77e0e94ffe8
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory5.unity
guid: 610bb772748d9e14b900c143561e8aaa
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory6.unity
guid: 47d839d999f6edc41a9f70755023b7e8
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory7.unity
guid: 9d72f13296e57cd4ab4452b6e96a7a87
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory8.unity
guid: e4c4febf70bcd034099ac0ed0ba69d24
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory9.unity
guid: 782d2e6a67496b442b64d76a0d3989c0
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory10.unity
guid: 4203f3f88fec5654f909cbe5982fcb9c
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory11.unity
guid: 31ac6240fd8b27444b56b6f62de91781
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory12.unity
guid: eb554d641fba0f8409680b8f8d0b9d5e
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory13.unity
guid: 3531d4659f140034d9263756f5f58a6c
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory14.unity
guid: 56cf57dd7aea50d489258cd408bd6520
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory15.unity
guid: 7961e32a2d901654787d54b8fb764e23
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MainStory16.unity
guid: 5e537e3afb972e44baed795a51cbe939
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_MarvellousSquare.unity
guid: 1e11547db33b2ee439e611d01dcc9f0d
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Pve.unity
guid: e415bacbb0283f24baca2c264f9ccfd1
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_PersonalPvp1.unity
guid: 0e3f95dffb62df641b220bf8ccc1b7f8
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_PersonalPvp2.unity
guid: 9ccf7a60ffac9be4ab3263a3b67cf9bf
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_PersonalPvp3.unity
guid: 5f618dca93745264f8fb5261621a3bcb
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_ManulEquip1.unity
guid: cb98f349f62e32d45a0a8ef57a0b6633
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_ManulEquip2.unity
guid: 8981e7a1731d15c4caa1479fb37223c4
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_ManulEquip3.unity
guid: aab02a6706a731043add237eab876f6c
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_PersonalBoss.unity
guid: e971fbe570ac7284baffa4db1e8b7cbc
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Challenge_Middle.unity
guid: 2d2d745676fe74945894a6d128bd1851
- enabled: 0
- enabled: 1
path: Assets/Download/Scenes/Scene_Challenge_Hard.unity
guid: 2c493ca3d57147a41b50962f3e421e56
m_configObjects: