星魂分解
|
@ -1,11 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="56,56" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<controller name="effect" pages="0,无,1,星魂,2,强化,3,星魂|强化,6,星魂+10,7,,8,星魂+10|强化,9,,10,星魂+20,11,,12,星魂+20|强化" selected="4"/>
|
||||
<displayList>
|
||||
<image id="n0_7bww" name="n0" src="7bww8" fileName="Asstes/Character_ge.png" xy="0,0" size="56,56">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
<loader id="n1_7bww" name="icon" xy="4,4" size="48,48" fill="scaleFree"/>
|
||||
<movieclip id="n2_fg9v" name="n2" src="fg9vto9" fileName="AnimItem_Strength_15.jta" pkg="kqsmrpxl" xy="4,4" size="48,48" alpha="0.7">
|
||||
<gearDisplay controller="effect" pages="2,3,8,12"/>
|
||||
<relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
|
||||
</movieclip>
|
||||
<movieclip id="n3_fg9v" name="n3" src="fg9vto8" fileName="AnimSlot_UltiStarSoul.jta" pkg="kqsmrpxl" xy="0,0" size="56,56" grayed="true">
|
||||
<gearDisplay controller="effect" pages="1,3,6,8,10,12"/>
|
||||
<gearLook controller="effect" pages="1,3,6,8" values="0.6,0,1,0|0.6,0,1,0|1,0,1,0|1,0,1,0" default="1,0,0,0"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</movieclip>
|
||||
</displayList>
|
||||
<Button downEffect="scale" downEffectValue=".8"/>
|
||||
</component>
|
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 3.0 KiB |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.8 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 4.8 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 4.4 KiB |
|
@ -245,6 +245,26 @@
|
|||
<image id="nkk2utmd" name="MainUI_message_Left.png" path="/MainUI/Assets/"/>
|
||||
<image id="nkk2utme" name="MainUI_message_Right.png" path="/MainUI/Assets/"/>
|
||||
<component id="j0oiutmf" name="ButtonPet.xml" path="/MainUI/"/>
|
||||
<movieclip id="fg9vto9" name="AnimItem_Strength_15.jta" path="/" exported="true" atlas="1"/>
|
||||
<movieclip id="fg9vto8" name="AnimSlot_UltiStarSoul.jta" path="/" exported="true" atlas="1"/>
|
||||
<image id="fg9vtnq" name="EqiupUp (001).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnr" name="EqiupUp (002).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtns" name="EqiupUp (003).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnt" name="EqiupUp (004).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnu" name="EqiupUp (005).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnv" name="EqiupUp (006).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnw" name="EqiupUp (007).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnx" name="EqiupUp (008).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtny" name="EqiupUp (009).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vtnz" name="EqiupUp (010).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto0" name="Ui_effect_up (001).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto1" name="Ui_effect_up (002).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto2" name="Ui_effect_up (003).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto3" name="Ui_effect_up (004).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto4" name="Ui_effect_up (005).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto5" name="Ui_effect_up (006).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto6" name="Ui_effect_up (007).png" path="/Assets/Anim/"/>
|
||||
<image id="fg9vto7" name="Ui_effect_up (008).png" path="/Assets/Anim/"/>
|
||||
</resources>
|
||||
<publish name=""/>
|
||||
</packageDescription>
|
|
@ -3052,4 +3052,20 @@ message M2C_ResolveStarSoul // IActorLocationResponse
|
|||
int32 Error = 91;
|
||||
string Message = 92;
|
||||
repeated RewardItem itenList=1;
|
||||
}
|
||||
//ResponseType M2C_BuyInMultiShop
|
||||
message C2M_BuyInMultiShop // IActorLocationRequest
|
||||
{
|
||||
int32 RpcId = 90;
|
||||
int64 ActorId = 93;
|
||||
int32 shopType=1;
|
||||
int32 index =2;
|
||||
int32 count=3;
|
||||
}
|
||||
message M2C_BuyInMultiShop // IActorLocationResponse
|
||||
{
|
||||
int32 RpcId = 90;
|
||||
int32 Error = 91;
|
||||
string Message = 92;
|
||||
repeated BagMap BagMapList =1;
|
||||
}
|
|
@ -586,6 +586,24 @@ namespace ET
|
|||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
[DataTableMethod]
|
||||
public static async ETTask ActiveWorldBossCopy(object arg)
|
||||
{
|
||||
try
|
||||
{
|
||||
ActiveArgs args = arg.As<ActiveArgs>();
|
||||
var unit = args.unit;
|
||||
if (!unit.IsTeamLeader)
|
||||
return;
|
||||
if (unit.teamState != TeamState.None)
|
||||
return;
|
||||
Game.EventSystem.Publish(new ChangeMap() { unit = unit, mapId = Sys_SceneId.Scene_WorldBoss * 100 + 1 });
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
|
||||
[DataTableMethod]
|
||||
public static async ETTask ActiveIdleBattle(object arg)
|
||||
|
@ -643,5 +661,80 @@ namespace ET
|
|||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
[DataTableMethod]
|
||||
public static async ETTask WorldBossBattleVictory(object arg)
|
||||
{
|
||||
try
|
||||
{
|
||||
CopyBattleArgs copyBattleArgs = arg.As<CopyBattleArgs>();
|
||||
CopyBattle self = copyBattleArgs.copyBattle;
|
||||
Team team = copyBattleArgs.team;
|
||||
Unit unit = MapUnitComponent.Instance.Get(team.LeaderId);
|
||||
Log.Info(team.GetMemberName() + $"{self.battleType}胜利了!");
|
||||
UnitScene unitScene = unit.GetComponent<UnitScene>();
|
||||
int mapId = unitScene.MapId;
|
||||
await TimerComponent.Instance.WaitAsync(5000L);
|
||||
foreach (Unit unit1 in team.GetUnits())
|
||||
{
|
||||
MessageHelper.SendActor(unit1, new M2C_BattleVictory { BattleType = (int) self.battleType });
|
||||
}
|
||||
await TimerComponent.Instance.WaitAsync(500L);
|
||||
if (MapHelper.GetMapType(mapId / 100) == UnitSceneType.WorldBoss)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Error($"{unit.Id.GetPlayerFormatName()} 位置错误 : {mapId}");
|
||||
Game.EventSystem.Publish(new BackMainCity() { unit = unit, isForce = true });
|
||||
}
|
||||
|
||||
await BattleHelper.VictoryOption(self, team, self.configId);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
[DataTableMethod]
|
||||
public static async ETTask WorldBossBattleDefeat(object arg)
|
||||
{
|
||||
try
|
||||
{
|
||||
CopyBattleArgs copyBattleArgs = arg.As<CopyBattleArgs>();
|
||||
CopyBattle self = copyBattleArgs.copyBattle;
|
||||
Team team = copyBattleArgs.team;
|
||||
long instanceId = team.InstanceId;
|
||||
Unit unit = MapUnitComponent.Instance.Get(team.LeaderId);
|
||||
Log.Info(team.GetMemberName() + $"{self.battleType}失败了!");
|
||||
UnitScene unitScene = unit.GetComponent<UnitScene>();
|
||||
int mapId = unitScene.MapId;
|
||||
|
||||
await TimerComponent.Instance.WaitAsync(5000L);
|
||||
foreach (Unit unit1 in team.GetUnits())
|
||||
{
|
||||
MessageHelper.SendActor(unit1, new M2C_BattleDefeat { BattleType = (int) self.battleType });
|
||||
}
|
||||
await TimerComponent.Instance.WaitAsync(500L);
|
||||
if (MapHelper.GetMapType(mapId / 100) == UnitSceneType.WorldBoss)
|
||||
{
|
||||
if (team.InstanceId != instanceId)
|
||||
{
|
||||
Log.Error($"team instanceId is not same : old ={instanceId} new = {team.InstanceId}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Error($"{unit.Id.GetPlayerFormatName()} 位置错误 : {mapId}");
|
||||
Game.EventSystem.Publish(new BackMainCity() { unit = unit, isForce = true });
|
||||
}
|
||||
|
||||
await BattleHelper.DefeatOption(self, team,true);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -78,7 +78,7 @@ namespace ET
|
|||
private void GenerateManulEquipMapMonster(Unit unit, UnitScene _unitScene)
|
||||
{
|
||||
Unit monster = EntityFactory.CreateWithParent<Unit, UnitType>(unit.DomainScene(), UnitType.Monster);
|
||||
int layer = _unitScene.layerId;
|
||||
int layer = _unitScene.layer;
|
||||
MapMonsterConfig mapMonsterConfig = MapMonsterConfigCategory.Instance.GetManulEquipMapMonster(layer);
|
||||
long configId = 0;
|
||||
int difficulty = _unitScene.sceneId - Sys_SceneId.Scene_ManulEquip1 + 1;
|
||||
|
@ -116,7 +116,7 @@ namespace ET
|
|||
private void GenerateSpaceTravelMapMonster(Unit unit, UnitScene _unitScene)
|
||||
{
|
||||
Unit monster = EntityFactory.CreateWithParent<Unit, UnitType>(unit.DomainScene(), UnitType.Monster);
|
||||
MapMonsterConfig mapMonsterConfig = MapMonsterConfigCategory.Instance.GetSpaceTravelMapMonster(_unitScene.layerId);
|
||||
MapMonsterConfig mapMonsterConfig = MapMonsterConfigCategory.Instance.GetSpaceTravelMapMonster(_unitScene.layer);
|
||||
long configId = 0;
|
||||
int difficult = _unitScene.sceneId - Sys_SceneId.Scene_SpaceTravel1 + 1;
|
||||
if (difficult <= 0)
|
||||
|
@ -125,10 +125,10 @@ namespace ET
|
|||
return;
|
||||
}
|
||||
|
||||
SpaceTravelConfig spaceTravelConfig = SpaceTravelConfigCategory.Instance.GetByDifficultAndIndex(difficult, _unitScene.layerId);
|
||||
SpaceTravelConfig spaceTravelConfig = SpaceTravelConfigCategory.Instance.GetByDifficultAndIndex(difficult, _unitScene.layer);
|
||||
if (spaceTravelConfig == null)
|
||||
{
|
||||
Log.Error($"config == null when difficult = {difficult} index = {_unitScene.layerId}");
|
||||
Log.Error($"config == null when difficult = {difficult} index = {_unitScene.layer}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -151,17 +151,19 @@ namespace ET
|
|||
private void GenerateStarSoulCopyMapMonster(Unit unit, UnitScene _unitScene)
|
||||
{
|
||||
Unit monster = EntityFactory.CreateWithParent<Unit, UnitType>(unit.DomainScene(), UnitType.Monster);
|
||||
MapMonsterConfig mapMonsterConfig = MapMonsterConfigCategory.Instance.GetStarSoulCopyMapMonster(_unitScene.layerId);
|
||||
MapMonsterConfig mapMonsterConfig = MapMonsterConfigCategory.Instance.GetStarSoulCopyMapMonster(_unitScene.layer);
|
||||
Team team = TeamComponent.Instance.Get(unit.TeamLeaderId);
|
||||
var leader = team.GetLeader();
|
||||
StarSoulCopyConfigComponent soulCopyConfigComponent = leader.GetComponent<StarSoulCopyConfigComponent>();
|
||||
if (soulCopyConfigComponent == null)
|
||||
return;
|
||||
long configId = 0;
|
||||
StarSoulCopyConfig soulCopyConfig = StarSoulCopyConfigCategory.Instance.GetByTypeAndDifficultyAndIndex(soulCopyConfigComponent.type,
|
||||
soulCopyConfigComponent.difficulty, (byte) _unitScene.layerId);
|
||||
soulCopyConfigComponent.difficulty, (byte) _unitScene.layer);
|
||||
if (soulCopyConfig == null)
|
||||
{
|
||||
Log.Error(
|
||||
$"config == null when type = {soulCopyConfigComponent.type} difficult = {soulCopyConfigComponent.difficulty} index = {_unitScene.layerId}");
|
||||
$"config == null when type = {soulCopyConfigComponent.type} difficult = {soulCopyConfigComponent.difficulty} index = {_unitScene.layer}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -224,6 +224,22 @@ namespace ET
|
|||
|
||||
await SpaceTravelReward(unit, monsterBase, rewordMap);
|
||||
return;
|
||||
case BattleType.WorldBoss:
|
||||
WorldBossConfig worldBossConfig =WorldBossConfigCategory.Instance.Get(configId);
|
||||
if (worldBossConfig == null)
|
||||
{
|
||||
Log.ErrorDetail($"{unit.Id.GetPlayerFormatName()} battle type is {battleType} configId = {configId}");
|
||||
return;
|
||||
}
|
||||
monsterBase = MonsterBaseCategory.Instance.Get(worldBossConfig.MonsterId[0]);
|
||||
if (monsterBase == null)
|
||||
{
|
||||
Log.ErrorDetail($"{unit.Id.GetPlayerFormatName()} battle type is {battleType} MonsterId = {worldBossConfig.MonsterId[0]}");
|
||||
return;
|
||||
}
|
||||
|
||||
await WorldBossReward(unit, monsterBase, rewordMap);
|
||||
return;
|
||||
case BattleType.StarSoulCopy:
|
||||
StarSoulCopyConfig soulCopyConfig =StarSoulCopyConfigCategory.Instance.Get(configId);
|
||||
if (soulCopyConfig == null)
|
||||
|
@ -430,6 +446,18 @@ namespace ET
|
|||
}
|
||||
|
||||
}
|
||||
private async ETTask WorldBossReward(Unit unit, MonsterBase monsterBase, UnOrderMultiMap<long, (int, int)> rewordMap)
|
||||
{
|
||||
await ETTask.CompletedTask;
|
||||
float reduceDrop = 1;
|
||||
PlayerData playerData = unit.GetComponent<PlayerData>();
|
||||
NumericComponent num = unit.GetComponent<NumericComponent>();
|
||||
|
||||
if (reduceDrop == 0) return;
|
||||
M2C_SendReward rewardRet = new M2C_SendReward();
|
||||
DropHelper.Drop(unit, playerData, BattleType.ManulEquip, monsterBase.Dropasubset, rewordMap, reduceDrop, "世界boss副本掉落", false, list:rewardRet.ItemList);
|
||||
SendMessage(unit, num, rewardRet, 0, 0);
|
||||
}
|
||||
private static void SendMessage(Unit unit, NumericComponent num, M2C_SendReward rewardRet, long exp, long coin)
|
||||
{
|
||||
|
||||
|
|
|
@ -117,22 +117,26 @@ namespace ET
|
|||
return "系统错误";
|
||||
}
|
||||
|
||||
LinkedList<Unit> teamList = team.GetUnits();
|
||||
foreach (Unit u in teamList)
|
||||
UnitScene unitScene = unit.GetComponent<UnitScene>();
|
||||
if (unitScene.layer != 6)
|
||||
{
|
||||
PlayerData data = u.GetComponent<PlayerData>();
|
||||
if (data == null)
|
||||
|
||||
LinkedList<Unit> teamList = team.GetUnits();
|
||||
foreach (Unit u in teamList)
|
||||
{
|
||||
Log.Error($"data == null where id = {u?.Id}");
|
||||
continue;
|
||||
}
|
||||
PlayerData data = u.GetComponent<PlayerData>();
|
||||
if (data == null)
|
||||
{
|
||||
Log.Error($"data == null where id = {u?.Id}");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (data.travelVoucher <= 0)
|
||||
{
|
||||
return "您的或者队友的次数不够";
|
||||
if (data.travelVoucher <= 0)
|
||||
{
|
||||
return "您的或者队友的次数不够";
|
||||
}
|
||||
}
|
||||
}
|
||||
UnitScene unitScene = unit.GetComponent<UnitScene>();
|
||||
UnitSceneType unitSceneType = MapHelper.GetMapType(unitScene.sceneId);
|
||||
if (unitSceneType != UnitSceneType.SpaceTravel)
|
||||
{
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
using System;
|
||||
using Cal.DataTable;
|
||||
|
||||
namespace ET
|
||||
{
|
||||
|
||||
[ActorMessageHandler]
|
||||
public class C2M_BuyInMultiShopHandler: AMActorLocationRpcHandler<Unit, C2M_BuyInMultiShop, M2C_BuyInMultiShop>
|
||||
{
|
||||
protected override async ETTask Run(Unit unit, C2M_BuyInMultiShop request, M2C_BuyInMultiShop response, Action reply)
|
||||
{
|
||||
Shop shop = unit.Domain.GetComponent<Shop>();
|
||||
string ret = shop.BuyInMultiShop(unit, (ShopType) request.shopType, request.index, request.count);
|
||||
if (!ret.Equals(string.Empty))
|
||||
{
|
||||
response.Message = ret;
|
||||
reply();
|
||||
return;
|
||||
}
|
||||
|
||||
BagHelper.GetBagInfo(unit, response.BagMapList);
|
||||
reply();
|
||||
await ETTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -4,7 +4,7 @@ using System.Collections.Generic;
|
|||
namespace ET
|
||||
{
|
||||
[ActorMessageHandler]
|
||||
public class C2M_ChangeNickNameHandler : AMActorLocationRpcHandler<Unit, C2M_ChangeNickName, M2C_ChangeNickName>
|
||||
public class C2M_ChangeNickNameHandler: AMActorLocationRpcHandler<Unit, C2M_ChangeNickName, M2C_ChangeNickName>
|
||||
{
|
||||
protected override async ETTask Run(Unit unit, C2M_ChangeNickName request, M2C_ChangeNickName response, Action reply)
|
||||
{
|
||||
|
@ -15,6 +15,7 @@ namespace ET
|
|||
reply();
|
||||
return;
|
||||
}
|
||||
|
||||
User user = await UserComponent.Instance.Query(unit.Id);
|
||||
string oldName = user.NickName;
|
||||
string name = request.name;
|
||||
|
@ -24,24 +25,27 @@ namespace ET
|
|||
reply();
|
||||
return;
|
||||
}
|
||||
List<NickName> list =await DBComponent.Instance.Query<NickName>(t => t.Nickname == name);
|
||||
if(list!=null && list.Count > 0)
|
||||
|
||||
List<NickName> list = await DBComponent.Instance.Query<NickName>(t => t.Nickname == name);
|
||||
if (list != null && list.Count > 0)
|
||||
{
|
||||
response.Message = "昵称重复";
|
||||
reply();
|
||||
return;
|
||||
}
|
||||
|
||||
await DBComponent.Instance.Remove<NickName>(t => t.Nickname == user.NickName);
|
||||
using NickName nickName = EntityFactory.Create<NickName>(unit.DomainScene());
|
||||
nickName.Nickname = name;
|
||||
await DBComponent.Instance.Save(nickName);
|
||||
user.NickName = name;
|
||||
await UserComponent.Instance.Save(user);
|
||||
using NickNameLog log = EntityFactory.CreateWithId<NickNameLog>(unit.DomainScene(),unit.Id);
|
||||
if(log.nameList.Count==0|| log.nameList[^1]!=oldName)
|
||||
log.nameList.Add(oldName);
|
||||
NickNameLog log= await DBComponent.Instance.Query<NickNameLog>(unit.Id) ?? EntityFactory.CreateWithId<NickNameLog>(unit.DomainScene(), unit.Id);
|
||||
if (log.nameList.Count == 0 || log.nameList[^1] != oldName)
|
||||
log.nameList.Add(oldName);
|
||||
log.nameList.Add(name);
|
||||
await DBComponent.Instance.Save(log);
|
||||
log.Dispose();
|
||||
|
||||
reply();
|
||||
await ETTask.CompletedTask;
|
||||
|
|
|
@ -223,7 +223,6 @@ namespace ET
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
internal static async ETTask VictoryOption(CopyBattle self, Team team, long configid = 0)
|
||||
{
|
||||
try
|
||||
|
@ -235,14 +234,15 @@ namespace ET
|
|||
UnOrderMultiMapComponent<long, (int, int)> rewordMapComponent = UnOrderMultiMapComponent<long, (int, int)>.Create();
|
||||
foreach (Unit u in teamList)
|
||||
{
|
||||
Game.EventSystem.Publish(new EventType.BattleEnd { unit = u, team = team }).Coroutine();
|
||||
Game.EventSystem.Publish(new EventType.BattleEnd_AddHp { unit = u }).Coroutine();
|
||||
u.Live();
|
||||
await Game.EventSystem.Publish(new EventType.BattleEnd_Reword
|
||||
{
|
||||
unit = u, rewordMap = rewordMapComponent.MultiMap, battleType = self.battleType, configid = configid
|
||||
});
|
||||
u.Live();
|
||||
Game.EventSystem.Publish(new EventType.BattleEnd { unit = u, team = team }).Coroutine();
|
||||
Game.EventSystem.Publish(new EventType.BattleEnd_AddHp { unit = u }).Coroutine();
|
||||
}
|
||||
|
||||
BattleHelper.BrocastReword(teamList, rewordMapComponent).Coroutine();
|
||||
//!移除不在线玩家
|
||||
await TeamComponent.Instance.RemoveAllOffLineId(team);
|
||||
|
@ -253,7 +253,7 @@ namespace ET
|
|||
}
|
||||
}
|
||||
|
||||
internal static async ETTask DefeatOption(CopyBattle self, Team team)
|
||||
internal static async ETTask DefeatOption(CopyBattle self, Team team, bool hasReward = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
@ -264,6 +264,9 @@ namespace ET
|
|||
MessageHelper.SendActor(u, new M2C_BattleDefeat { BattleType = (int) self.battleType });
|
||||
}
|
||||
|
||||
UnOrderMultiMapComponent<long, (int, int)> rewordMapComponent = null;
|
||||
if (hasReward)
|
||||
rewordMapComponent = UnOrderMultiMapComponent<long, (int, int)>.Create();
|
||||
foreach (Unit u in teamList)
|
||||
{
|
||||
if (u.IsTeamLeader)
|
||||
|
@ -271,12 +274,22 @@ namespace ET
|
|||
Game.EventSystem.Publish(new EventType.BackMainCity { unit = u, isForce = true }).Coroutine();
|
||||
}
|
||||
|
||||
if (hasReward)
|
||||
{
|
||||
await Game.EventSystem.Publish(new EventType.BattleEnd_Reword
|
||||
{
|
||||
unit = u, rewordMap = rewordMapComponent.MultiMap, battleType = self.battleType, configid = self.configId
|
||||
});
|
||||
}
|
||||
|
||||
u.Live();
|
||||
//!战斗结束事件(回血)
|
||||
Game.EventSystem.Publish(new EventType.BattleEnd { unit = u, team = team }).Coroutine();
|
||||
Game.EventSystem.Publish(new EventType.BattleEnd_AddHp { unit = u }).Coroutine();
|
||||
}
|
||||
|
||||
if (hasReward)
|
||||
BattleHelper.BrocastReword(teamList, rewordMapComponent).Coroutine();
|
||||
//!移除不在线玩家
|
||||
await TeamComponent.Instance.RemoveAllOffLineId(team);
|
||||
}
|
||||
|
@ -326,7 +339,6 @@ namespace ET
|
|||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static void FamilyBossAddProperty(CopyBattle self, Unit unit)
|
||||
{
|
||||
FamilyBossConfig familyBossConfig = FamilyBossConfigCategory.Instance.Get(self.configId);
|
||||
|
@ -342,6 +354,7 @@ namespace ET
|
|||
def = MathHelper.RoundToInt(num.GetAsInt(NumericType.SpiDefBase) * additional);
|
||||
num.AddSet(NumericType.SpiDef, def);
|
||||
}
|
||||
|
||||
public static Team GetAnotherTeam(this CopyBattle self, Team team)
|
||||
{
|
||||
try
|
||||
|
@ -358,7 +371,6 @@ namespace ET
|
|||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static void StartCopy(Unit unit, string name)
|
||||
{
|
||||
Scene scene = MapFactory.CreateMap(unit.DomainZone(), name);
|
||||
|
@ -375,6 +387,5 @@ namespace ET
|
|||
|
||||
return count;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -15,8 +15,11 @@ namespace ET
|
|||
Voucher = 2,
|
||||
Coin = 3,
|
||||
Gem = 4,
|
||||
Hornor,
|
||||
PVPMoney,
|
||||
Family,
|
||||
WorldBoss,
|
||||
}
|
||||
private readonly static float[] CharacterPointScaleArr = { 0.1f, 0.42f, 1.07f, 1.89f };
|
||||
|
||||
internal static void ResetAddNumeric(Unit unit, NumericComponent num)
|
||||
{
|
||||
|
@ -447,6 +450,26 @@ namespace ET
|
|||
num.ReduceSet(NumericType.Gem, price);
|
||||
}
|
||||
break;
|
||||
case MoneyType.Hornor:
|
||||
{
|
||||
if (num.GetAsLong(NumericType.Honor) < price)
|
||||
return "您的荣誉不足,无法兑换!";
|
||||
num.ReduceSet(NumericType.Honor, price);
|
||||
}
|
||||
break;
|
||||
case MoneyType.PVPMoney:
|
||||
{
|
||||
if (num.GetAsLong(NumericType.PvpMoney) < price)
|
||||
return "您的竞技币不足,无法兑换!";
|
||||
num.ReduceSet(NumericType.PvpMoney, price);
|
||||
}
|
||||
break;
|
||||
case MoneyType.Family:
|
||||
break;
|
||||
case MoneyType.WorldBoss:
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof (moneyType), moneyType, null);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -59,6 +59,7 @@ namespace ET
|
|||
>=Sys_SceneId.Scene_StarSoulCopyA and
|
||||
<=Sys_SceneId.Scene_StarSoulCopyE
|
||||
=> UnitSceneType.StarSoulCopy,
|
||||
Sys_SceneId.Scene_WorldBoss=> UnitSceneType.WorldBoss,
|
||||
_ => UnitSceneType.Common,
|
||||
};
|
||||
}
|
||||
|
|
|
@ -40,8 +40,14 @@ namespace ET
|
|||
TargetableUnitComponent targetCompoennt = self.Parent.GetComponent<TargetableUnitComponent>();
|
||||
List<Unit> allList = targetCompoennt.GetAllTarget();
|
||||
|
||||
SkillTypes skillTypes = skillLogic.skillLogicConfig.skillType;
|
||||
var config = skillLogic.skillLogicConfig;
|
||||
SkillTypes skillTypes = config.skillType;
|
||||
|
||||
skillLogic.HandleEvent(SkillEventCondition.当技能施法前, new SkillSender
|
||||
{
|
||||
caster = unit,
|
||||
skillLogic = skillLogic,
|
||||
});
|
||||
return skillTypes switch
|
||||
{
|
||||
SkillTypes.普通 => SpellGeneralSkill(self, unit, skillLogic, allList),
|
||||
|
@ -54,7 +60,9 @@ namespace ET
|
|||
|
||||
private static bool SpellGeneralSkill(AttackComponent self, Unit unit, SkillLogic skillLogic, List<Unit> allList)
|
||||
{
|
||||
for (int i = skillLogic.GetPlayAmount() - 1; i >= 0; i--)
|
||||
int playAmount = skillLogic.GetPlayAmount();
|
||||
Log.Info($"{playAmount}");
|
||||
for (int i = playAmount - 1; i >= 0; i--)
|
||||
{
|
||||
SpellSkill(self, unit, skillLogic, allList).Coroutine();
|
||||
}
|
||||
|
|
|
@ -33,13 +33,14 @@ namespace ET
|
|||
return false;
|
||||
}
|
||||
|
||||
if (now - self.lastSkillTime >= self.roundCD)
|
||||
if (!(now - self.lastSkillTime >= self.roundCD))
|
||||
{
|
||||
self.lastSkillTime = now;
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
self.lastSkillTime = now;
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public static void PlayAutoSkill(this SkillAI self, long now)
|
||||
|
@ -185,7 +186,6 @@ namespace ET
|
|||
{
|
||||
return "冷却中!";
|
||||
}
|
||||
return canCast;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -394,7 +394,7 @@ namespace ET
|
|||
{
|
||||
if (list.Count < 2) return;
|
||||
using ListComponent<Unit> listComponent = ListComponent<Unit>.Create();
|
||||
listComponent.List.AddRange(list.FindAll(t => t && t.teamState != TeamState.Fight));
|
||||
listComponent.List.AddRange(list.FindAll(t => t && t.teamState != TeamState.Fight && t.GetComponent<PlayerData>().personalPvpCount< ConstDefine.PersonalMaxBattleCount));
|
||||
listComponent.List.Sort((a, b) =>
|
||||
{
|
||||
try
|
||||
|
|
|
@ -350,6 +350,7 @@ namespace ET
|
|||
//!商品下架
|
||||
await DBComponent.Instance.Remove<Consignment>(consignment.Id);
|
||||
self.ConsignmentDic.Remove(consignment.Id);
|
||||
await self.ReduceItemCount(consignment.UnitId);
|
||||
|
||||
//!卖家收钱(可能已经离线)
|
||||
Mail mail = new()
|
||||
|
@ -377,7 +378,6 @@ namespace ET
|
|||
});
|
||||
await MailComponent.Instance.AddMail(consignment.UnitId, mail);
|
||||
|
||||
await self.ReduceItemCount(consignment.UnitId);
|
||||
//!买家到货
|
||||
ItemComponent.Instance.AddItem(unit, consignment.Item.ItemId, consignment.Item.Count, false, consignment.Item, getSource: consignment.Item.getSource);
|
||||
|
||||
|
|
|
@ -54,6 +54,59 @@ namespace ET
|
|||
{
|
||||
self.ShopPageDic.Add(item.Page, item);
|
||||
}
|
||||
}public static string BuyInMultiShop(this Shop self, Unit unit, ShopType type, int index, int count)
|
||||
{
|
||||
if (type == ShopType.Family)
|
||||
return "暂未开放";
|
||||
List<MultiShop> list = MultiShopCategory.Instance.GetByType(type);
|
||||
if (list == null || list.Count == 0)
|
||||
{
|
||||
Log.Error($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】想要购买type = {type} index = {index}的【PageIndex】不存在的物品");
|
||||
return "系统错误";
|
||||
}
|
||||
MultiShop shopBase = list[index];
|
||||
if (shopBase == null)
|
||||
{
|
||||
Log.Error($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】想要购买type = {type} index = {index}的【index】不存在的物品");
|
||||
return "系统错误";
|
||||
}
|
||||
if (!ItemComponent.Instance.CanAddItem(unit, shopBase.ItemId, count))
|
||||
{
|
||||
return "背包已满,请整理您的背包!";
|
||||
}
|
||||
|
||||
long price = count * shopBase.Price;
|
||||
if (price <= 0)
|
||||
{
|
||||
Log.Error($"{unit.Id.GetPlayerFormatName()} 购买价格 < 0 : {price}");
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
string payRet = null;
|
||||
switch (type)
|
||||
{
|
||||
case ShopType.None:
|
||||
break;
|
||||
case ShopType.Gem:payRet= CharacterHelper.ReduceMoney(unit, CharacterHelper.MoneyType.Gem, price);
|
||||
break;
|
||||
case ShopType.Honor:payRet= CharacterHelper.ReduceMoney(unit, CharacterHelper.MoneyType.Hornor, price);
|
||||
break;
|
||||
case ShopType.Pvp: payRet= CharacterHelper.ReduceMoney(unit, CharacterHelper.MoneyType.PVPMoney, price);
|
||||
break;
|
||||
case ShopType.Family:payRet= CharacterHelper.ReduceMoney(unit, CharacterHelper.MoneyType.Family, price);
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof (type), type, null);
|
||||
}
|
||||
if (payRet != null)
|
||||
{
|
||||
return payRet;
|
||||
}
|
||||
//!给货
|
||||
BagHelper.AddItem(unit, shopBase.ItemId, count, true,getSource:"商店");
|
||||
UnitHelper.Save<Bag>(unit).Coroutine();
|
||||
UnitHelper.Save<NumericComponent>(unit).Coroutine();
|
||||
return string.Empty;
|
||||
}
|
||||
public static string BuyInShop(this Shop self, Unit unit, int page, int index, int count)
|
||||
{
|
||||
|
@ -69,17 +122,12 @@ namespace ET
|
|||
Log.Error($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】想要购买PageIndex = {page} index = {index}的【index】不存在的物品");
|
||||
return "系统错误";
|
||||
}
|
||||
if (!ItemComponent.Instance.CanAddItem(unit, shopBase.ItemId, count))
|
||||
if (!BagHelper.CanAddItem(unit, shopBase.ItemId, count))
|
||||
{
|
||||
return "背包已满,请整理您的背包!";
|
||||
}
|
||||
//if (shopBase.ItemId == 20009||shopBase.ItemId==110343)
|
||||
//{
|
||||
// return "淦!";
|
||||
//}
|
||||
//!收钱
|
||||
long price = count * shopBase.Price;
|
||||
if (price < 0)
|
||||
if (price <= 0)
|
||||
{
|
||||
Log.Error($"{unit.Id.GetPlayerFormatName()} 购买价格 < 0 : {price}");
|
||||
return "系统错误";
|
||||
|
@ -90,7 +138,7 @@ namespace ET
|
|||
return payRet;
|
||||
}
|
||||
//!给货
|
||||
ItemComponent.Instance.AddItem(unit, shopBase.ItemId, count, true,getSource:"商店");
|
||||
BagHelper.AddItem(unit, shopBase.ItemId, count, true,getSource:"商店");
|
||||
UnitHelper.Save<Bag>(unit).Coroutine();
|
||||
UnitHelper.Save<NumericComponent>(unit).Coroutine();
|
||||
return string.Empty;
|
||||
|
@ -129,7 +177,7 @@ namespace ET
|
|||
}
|
||||
//!收钱
|
||||
int price = count * marketBase.Price_YuanBao;
|
||||
if (price < 0)
|
||||
if (price <= 0)
|
||||
{
|
||||
Log.Error($"{unit.Id.GetPlayerFormatName()} 购买价格 < 0 : {price}");
|
||||
return "系统错误";
|
||||
|
@ -162,7 +210,7 @@ namespace ET
|
|||
return payRet;
|
||||
}
|
||||
//!给货
|
||||
ItemComponent.Instance.AddItem(unit, marketBase.ItemId, count, islock,getSource:"商城");
|
||||
BagHelper.AddItem(unit, marketBase.ItemId, count, islock,getSource:"商城");
|
||||
UnitHelper.Save<Bag>(unit).Coroutine();
|
||||
UnitHelper.Save<NumericComponent>(unit).Coroutine();
|
||||
return string.Empty;
|
||||
|
|
|
@ -6,8 +6,7 @@ using Cal.DataTable;
|
|||
|
||||
namespace ET
|
||||
{
|
||||
|
||||
public class UnitSkillComponentDestroySystem : DestroySystem<UnitSkillComponent>
|
||||
public class UnitSkillComponentDestroySystem: DestroySystem<UnitSkillComponent>
|
||||
{
|
||||
public override void Destroy(UnitSkillComponent self)
|
||||
{
|
||||
|
@ -23,7 +22,7 @@ namespace ET
|
|||
Dictionary<int, SkillLogicConfig>.KeyCollection skillLogicConfig = SkillConfigComponent.SkillLogicCollection.skillDic.Keys;
|
||||
foreach (int skillId in skillLogicConfig)
|
||||
{
|
||||
if (skillId / 100000 == (int)jobType)
|
||||
if (skillId / 100000 == (int) jobType)
|
||||
{
|
||||
UnitSkill unitSkill = new UnitSkill { Id = skillId };
|
||||
if (skillId % 100000 == 1)
|
||||
|
@ -40,7 +39,6 @@ namespace ET
|
|||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public static async ETTask ResetSkill(this UnitSkillComponent self)
|
||||
|
@ -57,12 +55,12 @@ namespace ET
|
|||
{
|
||||
try
|
||||
{
|
||||
|
||||
if (dicKV.Key % 100000 == 1)
|
||||
{
|
||||
unitSkill = dicKV.Value;
|
||||
continue;
|
||||
}
|
||||
|
||||
for (int i = 1; i <= dicKV.Value.Level; i++)
|
||||
{
|
||||
int nextSkillId = dicKV.Key * 100 + i;
|
||||
|
@ -73,9 +71,11 @@ namespace ET
|
|||
{
|
||||
retdic[item._Id] = 0;
|
||||
}
|
||||
|
||||
retdic[item._Id] += item.Count;
|
||||
}
|
||||
}
|
||||
|
||||
dicKV.Value.Level = 0;
|
||||
self.SkillUnLearnedDic.Add(dicKV.Key, dicKV.Value);
|
||||
}
|
||||
|
@ -84,6 +84,7 @@ namespace ET
|
|||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
|
||||
dic.Clear();
|
||||
if (unitSkill != null)
|
||||
{
|
||||
|
@ -91,21 +92,24 @@ namespace ET
|
|||
}
|
||||
else
|
||||
Log.Error($"skill == null where id = {unit.Id}");
|
||||
|
||||
foreach (KeyValuePair<int, int> item in retdic)
|
||||
{
|
||||
try
|
||||
{
|
||||
await MailHelper.AddItem(unit.Id, item.Key, item.Value, true, "", "重置技能", "节能书返还", "");
|
||||
await MailHelper.AddItem(unit.Id, item.Key, item.Value, true, "", "重置技能", "技能书返还", "");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
|
||||
UnitHelper.SaveComponenet(data).Coroutine();
|
||||
UnitHelper.SaveComponenet(self).Coroutine();
|
||||
UnitHelper.Save<NumericComponent>(unit).Coroutine();
|
||||
}
|
||||
|
||||
public static void ResetFreeSkill(this UnitSkillComponent self)
|
||||
{
|
||||
Unit unit = self.GetParent<Unit>();
|
||||
|
@ -119,12 +123,12 @@ namespace ET
|
|||
{
|
||||
try
|
||||
{
|
||||
|
||||
if (dicKV.Key % 100000 == 1)
|
||||
{
|
||||
unitSkill = dicKV.Value;
|
||||
continue;
|
||||
}
|
||||
|
||||
dicKV.Value.Level = 0;
|
||||
self.SkillUnLearnedDic.Add(dicKV.Key, dicKV.Value);
|
||||
}
|
||||
|
@ -133,6 +137,7 @@ namespace ET
|
|||
Log.Error(e);
|
||||
}
|
||||
}
|
||||
|
||||
dic.Clear();
|
||||
if (unitSkill != null)
|
||||
{
|
||||
|
@ -140,35 +145,39 @@ namespace ET
|
|||
}
|
||||
else
|
||||
Log.Error($"skill == null where id = {unit.Id}");
|
||||
|
||||
UnitHelper.SaveComponenet(data).Coroutine();
|
||||
UnitHelper.SaveComponenet(self).Coroutine();
|
||||
UnitHelper.Save<NumericComponent>(unit).Coroutine();
|
||||
}
|
||||
|
||||
public static void TransferJob(this UnitSkillComponent self, int job)
|
||||
{
|
||||
self.SkillLearnedDic.Clear();
|
||||
self.SkillUnLearnedDic.Clear();
|
||||
try
|
||||
{
|
||||
self.InitSkill((JobType)job);
|
||||
self.InitSkill((JobType) job);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e);
|
||||
Log.Error(e);
|
||||
}
|
||||
|
||||
PlayerData data = self.Parent.GetComponent<PlayerData>();
|
||||
KeyValuePair<int, int> kv = data.SkillPointKV;
|
||||
data.SkillPointKV = KeyValuePair.Create(kv.Value, kv.Value);
|
||||
UnitHelper.SaveComponenet(data).Coroutine();
|
||||
UnitHelper.SaveComponenet(self).Coroutine();
|
||||
}
|
||||
|
||||
public static bool InitMonsterSkill(this UnitSkillComponent self, int skillId)
|
||||
{
|
||||
UnitSkill unitSkill = new UnitSkill { Id = skillId };
|
||||
self.SkillUnLearnedDic.TryAdd(skillId, unitSkill);
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public static void LearnMonsterSkill(this UnitSkillComponent self, int skillId)
|
||||
{
|
||||
UnitSkill unitSkill = self.GetUnlearnedSkill(skillId);
|
||||
|
@ -177,11 +186,13 @@ namespace ET
|
|||
Log.Error($"未找到技能,Id为{skillId}");
|
||||
return;
|
||||
}
|
||||
|
||||
unitSkill.Level = 1;
|
||||
//unitSkill.UpdateSkillLevel(self.GetParent<Unit>());
|
||||
self.SkillLearnedDic.TryAdd(skillId, unitSkill);
|
||||
self.SkillUnLearnedDic.Remove(skillId);
|
||||
}
|
||||
|
||||
public static string LearnSkill(this UnitSkillComponent self, int skillId, int level)
|
||||
{
|
||||
//var unitSkill = self.GetSkill(skillId);
|
||||
|
@ -202,6 +213,7 @@ namespace ET
|
|||
//return string.Empty;
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
public static string LearnSkill(this UnitSkillComponent self, int skillId)
|
||||
{
|
||||
UnitSkill unitSkill = self.GetSkill(skillId);
|
||||
|
@ -210,17 +222,20 @@ namespace ET
|
|||
Log.Error($"unitSkill == null where id = {skillId}");
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
SkillConfig skillConfig = DataTableHelper.Get<SkillConfig>(skillId * 100);
|
||||
if (skillConfig == null)
|
||||
{
|
||||
Log.Error($"skillConfig == null where id = {skillId}");
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
int maxLevel = skillConfig.MaxLevel;
|
||||
if (unitSkill.Level == maxLevel)
|
||||
{
|
||||
return "等级达到最大级";
|
||||
}
|
||||
|
||||
NumericComponent num = self.Parent.GetComponent<NumericComponent>();
|
||||
int nextLevel = unitSkill.Level + 1;
|
||||
int nextSkillId = skillId * 100 + unitSkill.Level + 1;
|
||||
|
@ -230,10 +245,12 @@ namespace ET
|
|||
Log.Error($"skillConfig_Level == null where id = {nextSkillId}");
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
if (skillConfig_Level.LearnLevel > num.GetAsInt(NumericType.Level))
|
||||
{
|
||||
return "等级不足";
|
||||
}
|
||||
|
||||
PlayerData data = self.Parent.GetComponent<PlayerData>();
|
||||
int currPoint = data.SkillPointKV.Key;
|
||||
int totalPoint = data.SkillPointKV.Value;
|
||||
|
@ -241,6 +258,7 @@ namespace ET
|
|||
{
|
||||
return "技能点不足";
|
||||
}
|
||||
|
||||
//!判断前置
|
||||
if (skillConfig.PreSkillId != 0)
|
||||
{
|
||||
|
@ -250,6 +268,7 @@ namespace ET
|
|||
Log.Error($"skillConfig_PreSkill == null where id = {skillConfig.PreSkillId}");
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
int maxPreLevel = skillConfig_PreSkill.MaxLevel;
|
||||
UnitSkill unitPreSkill = self.GetSkill(skillConfig.PreSkillId);
|
||||
if (unitPreSkill == UnitSkill.Null)
|
||||
|
@ -257,6 +276,7 @@ namespace ET
|
|||
Log.Error($"unitPreSkill == null where id = {skillConfig.PreSkillId}");
|
||||
return "系统错误";
|
||||
}
|
||||
|
||||
if (unitPreSkill.Level < maxPreLevel)
|
||||
{
|
||||
return $"前置技能{skillConfig_PreSkill.Name}未完全掌握!";
|
||||
|
@ -266,16 +286,20 @@ namespace ET
|
|||
SkillLearn skillLearn = SkillLearnCategory.Instance.Get(nextSkillId);
|
||||
Unit unit = self.GetParent<Unit>();
|
||||
Bag bag = unit.GetComponent<Bag>();
|
||||
foreach (SkillLearn.Material needMaterial in skillLearn.MaterialArr)
|
||||
if (!AppConfig.inst.isTest)
|
||||
{
|
||||
if (!BagHelper.HasItem(bag, needMaterial._Id, needMaterial.Count))
|
||||
foreach (SkillLearn.Material needMaterial in skillLearn.MaterialArr)
|
||||
{
|
||||
return $"材料不足:{BagHelper.GetName(needMaterial._Id)} X {needMaterial.Count}";
|
||||
if (!BagHelper.HasItem(bag, needMaterial._Id, needMaterial.Count))
|
||||
{
|
||||
return $"材料不足:{BagHelper.GetName(needMaterial._Id)} X {needMaterial.Count}";
|
||||
}
|
||||
}
|
||||
|
||||
foreach (SkillLearn.Material needMaterial in skillLearn.MaterialArr)
|
||||
{
|
||||
BagHelper.DeleteItem(bag, needMaterial._Id, needMaterial.Count);
|
||||
}
|
||||
}
|
||||
foreach (SkillLearn.Material needMaterial in skillLearn.MaterialArr)
|
||||
{
|
||||
BagHelper.DeleteItem(bag, needMaterial._Id, needMaterial.Count);
|
||||
}
|
||||
|
||||
currPoint--;
|
||||
|
@ -287,40 +311,48 @@ namespace ET
|
|||
self.SkillLearnedDic.Add(skillId, unitSkill);
|
||||
self.SkillUnLearnedDic.Remove(skillId);
|
||||
}
|
||||
|
||||
UnitHelper.SaveComponenet(data).Coroutine();
|
||||
UnitHelper.SaveComponenet(self).Coroutine();
|
||||
return null;
|
||||
}
|
||||
|
||||
public static UnitSkill GetLearnedSkill(this UnitSkillComponent self, int skillId)
|
||||
{
|
||||
self.SkillLearnedDic.TryGetValue(skillId, out UnitSkill unitSkill);
|
||||
return unitSkill;
|
||||
}
|
||||
|
||||
public static IEnumerable<UnitSkill> GetLearnedSkills(this UnitSkillComponent self)
|
||||
{
|
||||
return self.SkillLearnedDic.Values;
|
||||
}
|
||||
|
||||
public static UnitSkill GetSkill(this UnitSkillComponent self, int skillId)
|
||||
{
|
||||
if (!self.SkillLearnedDic.TryGetValue(skillId, out UnitSkill unitSkill))
|
||||
{
|
||||
self.SkillUnLearnedDic.TryGetValue(skillId, out unitSkill);
|
||||
}
|
||||
|
||||
return unitSkill;
|
||||
}
|
||||
|
||||
public static UnitSkill GetUnlearnedSkill(this UnitSkillComponent self, int skillId)
|
||||
{
|
||||
self.SkillUnLearnedDic.TryGetValue(skillId, out UnitSkill unitSkill);
|
||||
return unitSkill;
|
||||
}
|
||||
|
||||
public static UnitSkill GetFirstUnlearnedSkill(this UnitSkillComponent self)
|
||||
{
|
||||
UnitSkill[] arr = self.SkillUnLearnedDic.Values.ToArray();
|
||||
return arr[0];
|
||||
}
|
||||
|
||||
public static IEnumerable<UnitSkill> GetUnlearnedSkills(this UnitSkillComponent self)
|
||||
{
|
||||
return self.SkillUnLearnedDic.Values;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -18,5 +18,6 @@ namespace ET
|
|||
ManulEquip = 6,
|
||||
SpaceTravel =7,
|
||||
StarSoulCopy =8,
|
||||
WorldBoss =8,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -58,5 +58,9 @@ namespace Cal.DataTable
|
|||
/// 星魂副本战斗
|
||||
/// </summary>
|
||||
public const int StarSoulBattle = 10014;
|
||||
/// <summary>
|
||||
/// 世界boss
|
||||
/// </summary>
|
||||
public const int WorldBossBattle = 10015;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ namespace Cal.DataTable
|
|||
public byte MonsterType;
|
||||
public long Exp;
|
||||
public int Dropasubset;
|
||||
public int HpTimes;
|
||||
public int Hp;
|
||||
public int Str;
|
||||
public int Wim;
|
||||
|
|
|
@ -815,6 +815,10 @@ namespace Cal.DataTable
|
|||
/// </summary>
|
||||
public const int FamilyBoss3 = 303;
|
||||
/// <summary>
|
||||
/// 世界boss
|
||||
/// </summary>
|
||||
public const int WorldBoss = 310;
|
||||
/// <summary>
|
||||
/// 1
|
||||
/// </summary>
|
||||
public const int SceneTransPoint = 1004;
|
||||
|
|
|
@ -198,5 +198,9 @@ namespace Cal.DataTable
|
|||
/// E星魂副本
|
||||
/// </summary>
|
||||
public const int Scene_StarSoulCopyE = 10049;
|
||||
/// <summary>
|
||||
/// 终极战场
|
||||
/// </summary>
|
||||
public const int Scene_WorldBoss = 10050;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
using ET;
|
||||
using MongoDB.Bson.Serialization.Attributes;
|
||||
|
||||
namespace Cal.DataTable
|
||||
{
|
||||
[Config]
|
||||
public partial class WorldBossConfigCategory : ACategory<WorldBossConfig>
|
||||
{
|
||||
public static WorldBossConfigCategory Instance;
|
||||
public WorldBossConfigCategory()
|
||||
{
|
||||
Instance = this;
|
||||
}
|
||||
}
|
||||
|
||||
public partial class WorldBossConfig:IConfig
|
||||
{
|
||||
[BsonId]
|
||||
public long Id { get; set; }
|
||||
public string Name;
|
||||
public int[] MonsterId;
|
||||
}
|
||||
}
|
|
@ -32,7 +32,7 @@ namespace ET
|
|||
[BsonIgnore]
|
||||
public int sceneId => this.MapId / 100;
|
||||
[BsonIgnore]
|
||||
public int layerId => this.MapId %100;
|
||||
public int layer => this.MapId %100;
|
||||
[BsonIgnore]
|
||||
public Vector2 Position {
|
||||
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
using System.Collections.Generic;
|
||||
using ET;
|
||||
|
||||
namespace Cal.DataTable
|
||||
{
|
||||
public enum ShopType: byte
|
||||
{
|
||||
None = 0,
|
||||
Gem,
|
||||
Honor,
|
||||
Pvp,
|
||||
Family
|
||||
}
|
||||
|
||||
public partial class MultiShopCategory
|
||||
{
|
||||
private UnOrderMultiMap<byte, MultiShop> shopTypeDic = new UnOrderMultiMap<byte, MultiShop>();
|
||||
|
||||
public List<MultiShop> GetByType(ShopType type)
|
||||
{
|
||||
var list= this.shopTypeDic[(byte) type];
|
||||
if (list == null)
|
||||
{
|
||||
Log.Error($"list ==null where type = {type}");
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
public override void EndInit()
|
||||
{
|
||||
base.EndInit();
|
||||
foreach (var kv in this.dict)
|
||||
{
|
||||
shopTypeDic.Add(kv.Value.Type,kv.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -7320,4 +7320,44 @@ namespace ET
|
|||
|
||||
}
|
||||
|
||||
[ResponseType(typeof(M2C_BuyInMultiShop))]
|
||||
[Message(OuterOpcode.C2M_BuyInMultiShop)]
|
||||
[ProtoContract]
|
||||
public partial class C2M_BuyInMultiShop:IActorLocationRequest
|
||||
{
|
||||
[ProtoMember(90)]
|
||||
public int RpcId { get; set; }
|
||||
|
||||
[ProtoMember(93)]
|
||||
public long ActorId { get; set; }
|
||||
|
||||
[ProtoMember(1)]
|
||||
public int shopType { get; set; }
|
||||
|
||||
[ProtoMember(2)]
|
||||
public int index { get; set; }
|
||||
|
||||
[ProtoMember(3)]
|
||||
public int count { get; set; }
|
||||
|
||||
}
|
||||
|
||||
[Message(OuterOpcode.M2C_BuyInMultiShop)]
|
||||
[ProtoContract]
|
||||
public partial class M2C_BuyInMultiShop:IActorLocationResponse
|
||||
{
|
||||
[ProtoMember(90)]
|
||||
public int RpcId { get; set; }
|
||||
|
||||
[ProtoMember(91)]
|
||||
public int Error { get; set; }
|
||||
|
||||
[ProtoMember(92)]
|
||||
public string Message { get; set; }
|
||||
|
||||
[ProtoMember(1)]
|
||||
public List<BagMap> BagMapList = new List<BagMap>();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -416,5 +416,7 @@ namespace ET
|
|||
public const ushort M2C_GetUIDByName = 20412;
|
||||
public const ushort C2M_ResolveStarSoul = 20413;
|
||||
public const ushort M2C_ResolveStarSoul = 20414;
|
||||
public const ushort C2M_BuyInMultiShop = 20415;
|
||||
public const ushort M2C_BuyInMultiShop = 20416;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
{ "fileMD5" : { "Anim.xlsx" : "545a68dfcadddaee53a26a0ba19376c1", "RobotAccount.xlsx" : "31431b89eabb3e5ecb63f20b59d30858", "LevelConfig.xlsx" : "91bc9dc0d28ba5b40afef4365043d3ab", "MapSceneConfig.xlsx" : "08b026a5e74128d9a03bc383fa166489", "PrefabConfig.xlsx" : "46ef389511d1c63705c182088bab0285", "RoleConfig.xlsx" : "b997e8f718e7427c9388ae0e27e93d16", "AnimationConfig.xlsx" : "0a7d708c495799f85a8c2a03ebb0dc49", "BossBase.xlsx" : "b4920d9ab94dfbf7fb7bd8811db3cbe5", "CameraPosition.xlsx" : "fbf71d84ad155465c43ff60240de4284", "CharacterGrowth.xlsx" : "a3d0398ea4ee2e3b8b716f7bb29e5f08", "EquipBase.xlsx" : "303516c5bc74dde57a9d0213bc1e00ea", "EquipForge.xlsx" : "fda15bcdc6b1fb0ec797091089682a23", "FamilyBossConfig.xlsx" : "eac9263d56e558729fa2e2d51ef865bf", "Forbidden.xlsx" : "28bbeeb0ebc58adab5eff9167497c7ac", "GoodsBase.xlsx" : "f902d34806e8737c6a8fffe732bbef3d", "ItemUpgrade.xlsx" : "55b96dc713fe42ed05cbbbd6b0865744", "MainStory.xlsx" : "48cc3d0b944dca80862a27c757d67f01", "MarketBase.xlsx" : "1cf03fdbc8dd3a807c3576cf48544d41", "MaterialBase.xlsx" : "ce7fd3458aed257b8a78fb8c75a876f8", "MonsterBase.xlsx" : "388bdb7fee113c9a87aaca8e614e3bbf", "NPCBase.xlsx" : "e64543df667ad4bfcabddd90e50768ce", "OnlineRewardBase.xlsx" : "e376d6f31abc8c39397f03f8c24fc7bc", "QuestConfig.xlsx" : "882de4872ea851fea32138f6d48798b1", "RoleGrowth.xlsx" : "1384845a732285f6affef3cf6c67a672", "RolesPosition.xlsx" : "f5888586a320dfcd693c91c1f7cfc90d", "ShopBase.xlsx" : "717de9348e7b7501a5e819947a7fea7e", "SkillConfig.xlsx" : "2c1d2efd7f5c6116ba07f45c305180af", "SkillGroupBase.xlsx" : "e926883a016ef8b883c5c2f69a25ac2a", "SkinBase.xlsx" : "04d3e1c196a7c804e1ba6974f1284c39", "Sys_Code.xlsx" : "8eff5c2fd8743578db17c86a81862d39", "Sys_Prefab.xlsx" : "88655b126bb3ad457457472d80fe7f84", "Sys_Scene.xlsx" : "2daaf184fdcfed70a9254ab5a612d5ec", "TaskBase.xlsx" : "f7aa18a2225a75262b9735bf97dabed1", "TrialCopy.xlsx" : "b85d1a4bdc49dbc63a759a499aed8f5f", "Parentset.xlsx" : "da1f21299afe6361ec2705300e468345", "SonAdvancedSet.xlsx" : "7128d07efa77d9de70d956b71c926e31", "SonSet.xlsx" : "c342bdb10b5c82e8601fe41e5a254409", "EffectConfig.xlsx" : "c49b8ae9632120926c26991a25381e35", "HonorShop.xlsx" : "e7f2f48832e7e5fb6f8d56771c0551a6", "SkillLearn.xlsx" : "fb6cbb056172b57358502f18abd86a62", "FamilyShop.xlsx" : "fceadcf0570b35f1f6f24b0a67c73020", "EquipAffixConfig.xlsx" : "e33e0d8d934d7c145c07f1093f412981", "EquipUpgrade.xlsx" : "dc4758cffc7cf51e2a125969b2fc1d49", "MainStoryExp.xlsx" : "1e191962e19dcae5344f53bda64a5dec", "ManulEquip.xlsx" : "0eb382ad71752f63bf1b235809c0c17f", "ManulEquipAttribute.xlsx" : "c4869a18be4c14784fd26b697fa23f86", "ManulEquipMonsterConfig.xlsx" : "da4ca0343b0c77aed966c3ee9568cf68", "TransmigrationAddConfig.xlsx" : "620912bfbe398914fa8b3bf21afeeccf", "EquipBase .xlsx" : "0d52dbe61e0808bc75f59207e73ad7fb", "TitleConfig.xlsx" : "07d9306032f86e7b9642a61a8a2ee966", "GemInlayConfig.xlsx" : "d2bfb6e76b895f5c8f1caed238eeb0f9", "Strengthentable.xlsx" : "fdb418090e31b0bfb93c9ae9fc9bd9f1", "GemPriceConfig.xlsx" : "011721c1a612634195bffd58fb895279", "MapMonsterConfig.xlsx" : "99b1d7454d78e7679deeb29150abd3db", "TransferJobConfig.xlsx" : "5b0daa2b0837e66196fbda214d72678a", "GMConfig.xlsx" : "c8e6ed377384ace1cf783e12b3ade4c8", "SuitConfig.xlsx" : "b67db1e911e14362e3409cb9f5f94216", "PetConfig.xlsx" : "4612dd8a5c3af3d3f21a4b7307eb169d", "PetLevelConfig.xlsx" : "a86c4cbde022ccd884ccf572ad5edfe7", "PetExploreConfig.xlsx" : "333043bd5c172def36660eca1dc8416a", "AIConfig.xlsx" : "871d248a954d8c59188e41d002135c75", "CopyConfig.xlsx" : "0c430ea6eb850380e71b9c6e336ac189", "CopyRewordConfig.xlsx" : "f4de20211685f21d15a8170061fdc7d2", "SpaceTravelConfig.xlsx" : "be6486259f73db40a93bdecef00a066e", "SceneTransConfig.xlsx" : "9e31820e1273e184987f970a20be4a45", "ArenaShop.xlsx" : "3fd4650500dd2bf83064a1fd46e4444d", "StarShop.xlsx" : "e14b5e252416a12318e775d86dd1b2f7", "StarSoulTypeConfig.xlsx" : "c16e5b01ce7261f11f3c1c4c8db1f1d9", "StarSoulAttributeConfig.xlsx" : "eae313d2f6cf4fdba87e53f51dc7d57f", "StarSoulEquipAttributeTypeConfig.xlsx" : "0aadceefcf88bc9d2b6d5c643cad79ce", "StarSoulLevelConfig.xlsx" : "c19aa663716ffb2690e8b93edf3460bd", "ActivePerDayConfig.xlsx" : "cf0b65ead205b7468f6e06136ae7a172", "StarSoulCopyConfig.xlsx" : "921a5d72a0a56ef33bbe03285dafe9d5", "StarSoulResolveConfig.xlsx" : "ad1ce53ff0e030c0163ec5bb14b8e483", "MultiShop.xlsx" : "3f12a91537c13ad1ba30fe9696bb495b" } }
|
||||
{ "fileMD5" : { "Anim.xlsx" : "545a68dfcadddaee53a26a0ba19376c1", "RobotAccount.xlsx" : "31431b89eabb3e5ecb63f20b59d30858", "LevelConfig.xlsx" : "91bc9dc0d28ba5b40afef4365043d3ab", "MapSceneConfig.xlsx" : "08b026a5e74128d9a03bc383fa166489", "PrefabConfig.xlsx" : "46ef389511d1c63705c182088bab0285", "RoleConfig.xlsx" : "b997e8f718e7427c9388ae0e27e93d16", "AnimationConfig.xlsx" : "0a7d708c495799f85a8c2a03ebb0dc49", "BossBase.xlsx" : "b4920d9ab94dfbf7fb7bd8811db3cbe5", "CameraPosition.xlsx" : "fbf71d84ad155465c43ff60240de4284", "CharacterGrowth.xlsx" : "a3d0398ea4ee2e3b8b716f7bb29e5f08", "EquipBase.xlsx" : "303516c5bc74dde57a9d0213bc1e00ea", "EquipForge.xlsx" : "fda15bcdc6b1fb0ec797091089682a23", "FamilyBossConfig.xlsx" : "eac9263d56e558729fa2e2d51ef865bf", "Forbidden.xlsx" : "28bbeeb0ebc58adab5eff9167497c7ac", "GoodsBase.xlsx" : "f902d34806e8737c6a8fffe732bbef3d", "ItemUpgrade.xlsx" : "55b96dc713fe42ed05cbbbd6b0865744", "MainStory.xlsx" : "48cc3d0b944dca80862a27c757d67f01", "MarketBase.xlsx" : "1cf03fdbc8dd3a807c3576cf48544d41", "MaterialBase.xlsx" : "38f5050170e193d772cc49631cce4d52", "MonsterBase.xlsx" : "1679ffcc814f1eddb63242a9159f79fc", "NPCBase.xlsx" : "e64543df667ad4bfcabddd90e50768ce", "OnlineRewardBase.xlsx" : "e376d6f31abc8c39397f03f8c24fc7bc", "QuestConfig.xlsx" : "882de4872ea851fea32138f6d48798b1", "RoleGrowth.xlsx" : "1384845a732285f6affef3cf6c67a672", "RolesPosition.xlsx" : "f5888586a320dfcd693c91c1f7cfc90d", "ShopBase.xlsx" : "717de9348e7b7501a5e819947a7fea7e", "SkillConfig.xlsx" : "2c1d2efd7f5c6116ba07f45c305180af", "SkillGroupBase.xlsx" : "e926883a016ef8b883c5c2f69a25ac2a", "SkinBase.xlsx" : "04d3e1c196a7c804e1ba6974f1284c39", "Sys_Code.xlsx" : "8eff5c2fd8743578db17c86a81862d39", "Sys_Prefab.xlsx" : "660338b1b8a84d6aa7545e80e4d623cc", "Sys_Scene.xlsx" : "31fdf110c53390cba449f05726440632", "TaskBase.xlsx" : "f7aa18a2225a75262b9735bf97dabed1", "TrialCopy.xlsx" : "b85d1a4bdc49dbc63a759a499aed8f5f", "Parentset.xlsx" : "2910a74c73a56792699a91adc5612b0b", "SonAdvancedSet.xlsx" : "7128d07efa77d9de70d956b71c926e31", "SonSet.xlsx" : "021bf1a5b33aa1bed44be6c9ac409033", "EffectConfig.xlsx" : "c49b8ae9632120926c26991a25381e35", "HonorShop.xlsx" : "e7f2f48832e7e5fb6f8d56771c0551a6", "SkillLearn.xlsx" : "fb6cbb056172b57358502f18abd86a62", "FamilyShop.xlsx" : "fceadcf0570b35f1f6f24b0a67c73020", "EquipAffixConfig.xlsx" : "e33e0d8d934d7c145c07f1093f412981", "EquipUpgrade.xlsx" : "dc4758cffc7cf51e2a125969b2fc1d49", "MainStoryExp.xlsx" : "1e191962e19dcae5344f53bda64a5dec", "ManulEquip.xlsx" : "0eb382ad71752f63bf1b235809c0c17f", "ManulEquipAttribute.xlsx" : "c4869a18be4c14784fd26b697fa23f86", "ManulEquipMonsterConfig.xlsx" : "da4ca0343b0c77aed966c3ee9568cf68", "TransmigrationAddConfig.xlsx" : "620912bfbe398914fa8b3bf21afeeccf", "EquipBase .xlsx" : "0d52dbe61e0808bc75f59207e73ad7fb", "TitleConfig.xlsx" : "07d9306032f86e7b9642a61a8a2ee966", "GemInlayConfig.xlsx" : "d2bfb6e76b895f5c8f1caed238eeb0f9", "Strengthentable.xlsx" : "fdb418090e31b0bfb93c9ae9fc9bd9f1", "GemPriceConfig.xlsx" : "011721c1a612634195bffd58fb895279", "MapMonsterConfig.xlsx" : "99b1d7454d78e7679deeb29150abd3db", "TransferJobConfig.xlsx" : "5b0daa2b0837e66196fbda214d72678a", "GMConfig.xlsx" : "c8e6ed377384ace1cf783e12b3ade4c8", "SuitConfig.xlsx" : "b67db1e911e14362e3409cb9f5f94216", "PetConfig.xlsx" : "4612dd8a5c3af3d3f21a4b7307eb169d", "PetLevelConfig.xlsx" : "a86c4cbde022ccd884ccf572ad5edfe7", "PetExploreConfig.xlsx" : "333043bd5c172def36660eca1dc8416a", "AIConfig.xlsx" : "871d248a954d8c59188e41d002135c75", "CopyConfig.xlsx" : "5a5954984cf1dd436c584b3628230a95", "CopyRewordConfig.xlsx" : "f4de20211685f21d15a8170061fdc7d2", "SpaceTravelConfig.xlsx" : "be6486259f73db40a93bdecef00a066e", "SceneTransConfig.xlsx" : "9de417cf0c76a9f96b45b6540f97de8a", "ArenaShop.xlsx" : "3fd4650500dd2bf83064a1fd46e4444d", "StarShop.xlsx" : "e14b5e252416a12318e775d86dd1b2f7", "StarSoulTypeConfig.xlsx" : "c16e5b01ce7261f11f3c1c4c8db1f1d9", "StarSoulAttributeConfig.xlsx" : "eae313d2f6cf4fdba87e53f51dc7d57f", "StarSoulEquipAttributeTypeConfig.xlsx" : "0aadceefcf88bc9d2b6d5c643cad79ce", "StarSoulLevelConfig.xlsx" : "c19aa663716ffb2690e8b93edf3460bd", "ActivePerDayConfig.xlsx" : "cfc99453ab2c1e56534dfb248e555749", "StarSoulCopyConfig.xlsx" : "921a5d72a0a56ef33bbe03285dafe9d5", "StarSoulResolveConfig.xlsx" : "ad1ce53ff0e030c0163ec5bb14b8e483", "MultiShop.xlsx" : "01328d5451d7ed0b3271994b9dc11a6e", "WorldBossConfig.xlsx" : "9b9c766cb9af33316006a292a1e69f88" } }
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 482de56c88713d442b97dd9a55770cc0
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,113 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: WorldBoss_Attack
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 21300000, guid: 97e8f2842e23de445a34536fee116afc, type: 3}
|
||||
- time: 0.083333336
|
||||
value: {fileID: 21300000, guid: 45381e84243893048824c0a7a8d07a36, type: 3}
|
||||
- time: 0.16666667
|
||||
value: {fileID: 21300000, guid: 122a79044b8b2c144931393d3bf37899, type: 3}
|
||||
- time: 0.25
|
||||
value: {fileID: 21300000, guid: 2c81d42f4295fec44b71ff22df8a5523, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: 21300000, guid: e5a4e099f5512084eb360f0098af1962, type: 3}
|
||||
- time: 0.4166667
|
||||
value: {fileID: 21300000, guid: ed0ef23350fd4c2479a910010fc1a3b0, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 21300000, guid: 5e362b09fc2e0d64392807ea44ea7ca2, type: 3}
|
||||
- time: 0.5833334
|
||||
value: {fileID: 21300000, guid: b6929348f51db9e40b384e73a569bc37, type: 3}
|
||||
- time: 0.6666667
|
||||
value: {fileID: 21300000, guid: 91f1a1f753aab124ca739a3c8ff1efee, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: 21300000, guid: fd178401ebb34b443b1f5afabcdad114, type: 3}
|
||||
- time: 0.8333334
|
||||
value: {fileID: 21300000, guid: bd72c587adeb3314ebfa472669cbc5d1, type: 3}
|
||||
- time: 0.9166667
|
||||
value: {fileID: 21300000, guid: 9093823e48178d244b1d21b77589b598, type: 3}
|
||||
- time: 1
|
||||
value: {fileID: 21300000, guid: 557d9da8414b6874d9e9ed32f092f860, type: 3}
|
||||
- time: 1.0833334
|
||||
value: {fileID: 21300000, guid: 290b1a710694cea4a8d71518007eda4b, type: 3}
|
||||
- time: 1.1666667
|
||||
value: {fileID: 21300000, guid: 5e48e0ef4b6abab4fae911fa23793260, type: 3}
|
||||
- time: 1.25
|
||||
value: {fileID: 21300000, guid: e03e6078ce6eab240b7a184dcb8abe28, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 12
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 21300000, guid: 97e8f2842e23de445a34536fee116afc, type: 3}
|
||||
- {fileID: 21300000, guid: 45381e84243893048824c0a7a8d07a36, type: 3}
|
||||
- {fileID: 21300000, guid: 122a79044b8b2c144931393d3bf37899, type: 3}
|
||||
- {fileID: 21300000, guid: 2c81d42f4295fec44b71ff22df8a5523, type: 3}
|
||||
- {fileID: 21300000, guid: e5a4e099f5512084eb360f0098af1962, type: 3}
|
||||
- {fileID: 21300000, guid: ed0ef23350fd4c2479a910010fc1a3b0, type: 3}
|
||||
- {fileID: 21300000, guid: 5e362b09fc2e0d64392807ea44ea7ca2, type: 3}
|
||||
- {fileID: 21300000, guid: b6929348f51db9e40b384e73a569bc37, type: 3}
|
||||
- {fileID: 21300000, guid: 91f1a1f753aab124ca739a3c8ff1efee, type: 3}
|
||||
- {fileID: 21300000, guid: fd178401ebb34b443b1f5afabcdad114, type: 3}
|
||||
- {fileID: 21300000, guid: bd72c587adeb3314ebfa472669cbc5d1, type: 3}
|
||||
- {fileID: 21300000, guid: 9093823e48178d244b1d21b77589b598, type: 3}
|
||||
- {fileID: 21300000, guid: 557d9da8414b6874d9e9ed32f092f860, type: 3}
|
||||
- {fileID: 21300000, guid: 290b1a710694cea4a8d71518007eda4b, type: 3}
|
||||
- {fileID: 21300000, guid: 5e48e0ef4b6abab4fae911fa23793260, type: 3}
|
||||
- {fileID: 21300000, guid: e03e6078ce6eab240b7a184dcb8abe28, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1.3333334
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 0
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3ca1c53d222f2a845a96229bb50e259c
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,89 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: WorldBoss_Hurt
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 21300000, guid: 982f20b0c70be09459b813212a8bb906, type: 3}
|
||||
- time: 0.083333336
|
||||
value: {fileID: 21300000, guid: ad90d36e0dc65f14ea47b141260c7e57, type: 3}
|
||||
- time: 0.16666667
|
||||
value: {fileID: 21300000, guid: 6c7b2831552a7b24bbc2d41c8142b185, type: 3}
|
||||
- time: 0.25
|
||||
value: {fileID: 21300000, guid: 2f02df31d08f03346b3497baeb2945e2, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: 21300000, guid: 6ecdb06d91c443a4c83ce55f83cb3880, type: 3}
|
||||
- time: 0.4166667
|
||||
value: {fileID: 21300000, guid: e659e2cef28e9a747b309b92e1d2082f, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 21300000, guid: f5034d93963fe1e449fa9e029b918db8, type: 3}
|
||||
- time: 0.5833334
|
||||
value: {fileID: 21300000, guid: 92f3a9f6726713948b69c830c9c1bbf4, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 12
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 21300000, guid: 982f20b0c70be09459b813212a8bb906, type: 3}
|
||||
- {fileID: 21300000, guid: ad90d36e0dc65f14ea47b141260c7e57, type: 3}
|
||||
- {fileID: 21300000, guid: 6c7b2831552a7b24bbc2d41c8142b185, type: 3}
|
||||
- {fileID: 21300000, guid: 2f02df31d08f03346b3497baeb2945e2, type: 3}
|
||||
- {fileID: 21300000, guid: 6ecdb06d91c443a4c83ce55f83cb3880, type: 3}
|
||||
- {fileID: 21300000, guid: e659e2cef28e9a747b309b92e1d2082f, type: 3}
|
||||
- {fileID: 21300000, guid: f5034d93963fe1e449fa9e029b918db8, type: 3}
|
||||
- {fileID: 21300000, guid: 92f3a9f6726713948b69c830c9c1bbf4, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 0.6666667
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 0
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a06a493ada70fa449b6f739df1775a3f
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,125 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: WorldBoss_Idle
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 21300000, guid: b552fb44d431b5743aaad0fcce11a0b7, type: 3}
|
||||
- time: 0.083333336
|
||||
value: {fileID: 21300000, guid: b65db2356c962de49bf55b10c5affefb, type: 3}
|
||||
- time: 0.16666667
|
||||
value: {fileID: 21300000, guid: ac6c9b57403f05e4d815804d96e59b54, type: 3}
|
||||
- time: 0.25
|
||||
value: {fileID: 21300000, guid: 25536a3bf1813b84a88bc2285185321a, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: 21300000, guid: d119df6ceacef2d4b9cf67c2f1bcc288, type: 3}
|
||||
- time: 0.4166667
|
||||
value: {fileID: 21300000, guid: 31bf973a74ed8fa41b2b5f3fe5ab801a, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 21300000, guid: 534d8f09986061040b8781265ac3cc23, type: 3}
|
||||
- time: 0.5833334
|
||||
value: {fileID: 21300000, guid: 2a206b7c32382574d8789376f87399b7, type: 3}
|
||||
- time: 0.6666667
|
||||
value: {fileID: 21300000, guid: b84eb067f67727348a1b3bd48b740307, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: 21300000, guid: 075d090f239f5e846870dd1f08f9b69f, type: 3}
|
||||
- time: 0.8333334
|
||||
value: {fileID: 21300000, guid: 298576afe4fd2aa44a3c0c39b6f44514, type: 3}
|
||||
- time: 0.9166667
|
||||
value: {fileID: 21300000, guid: 4fd9e2890e67ee443b056aeeab549f92, type: 3}
|
||||
- time: 1
|
||||
value: {fileID: 21300000, guid: 616d69e20223abc45894bc5a927953d4, type: 3}
|
||||
- time: 1.0833334
|
||||
value: {fileID: 21300000, guid: ee5d15c49fb6dbc45a0c58e4eee35327, type: 3}
|
||||
- time: 1.1666667
|
||||
value: {fileID: 21300000, guid: 1df5e004422d4cc4d94bdac404ea0d7d, type: 3}
|
||||
- time: 1.25
|
||||
value: {fileID: 21300000, guid: abac787697c283d4a8731efbca8afc6e, type: 3}
|
||||
- time: 1.3333334
|
||||
value: {fileID: 21300000, guid: 45066738ca7155c4c9233eb83fa79ac5, type: 3}
|
||||
- time: 1.4166667
|
||||
value: {fileID: 21300000, guid: 73b8ecbe6931f6e4ebcb270f87f94e5f, type: 3}
|
||||
- time: 1.5
|
||||
value: {fileID: 21300000, guid: 88acb6cbb57125445bf6c422d38018f3, type: 3}
|
||||
- time: 1.5833334
|
||||
value: {fileID: 21300000, guid: 1e16976e2a9c613419897c337ad731ad, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
m_SampleRate: 12
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 21300000, guid: b552fb44d431b5743aaad0fcce11a0b7, type: 3}
|
||||
- {fileID: 21300000, guid: b65db2356c962de49bf55b10c5affefb, type: 3}
|
||||
- {fileID: 21300000, guid: ac6c9b57403f05e4d815804d96e59b54, type: 3}
|
||||
- {fileID: 21300000, guid: 25536a3bf1813b84a88bc2285185321a, type: 3}
|
||||
- {fileID: 21300000, guid: d119df6ceacef2d4b9cf67c2f1bcc288, type: 3}
|
||||
- {fileID: 21300000, guid: 31bf973a74ed8fa41b2b5f3fe5ab801a, type: 3}
|
||||
- {fileID: 21300000, guid: 534d8f09986061040b8781265ac3cc23, type: 3}
|
||||
- {fileID: 21300000, guid: 2a206b7c32382574d8789376f87399b7, type: 3}
|
||||
- {fileID: 21300000, guid: b84eb067f67727348a1b3bd48b740307, type: 3}
|
||||
- {fileID: 21300000, guid: 075d090f239f5e846870dd1f08f9b69f, type: 3}
|
||||
- {fileID: 21300000, guid: 298576afe4fd2aa44a3c0c39b6f44514, type: 3}
|
||||
- {fileID: 21300000, guid: 4fd9e2890e67ee443b056aeeab549f92, type: 3}
|
||||
- {fileID: 21300000, guid: 616d69e20223abc45894bc5a927953d4, type: 3}
|
||||
- {fileID: 21300000, guid: ee5d15c49fb6dbc45a0c58e4eee35327, type: 3}
|
||||
- {fileID: 21300000, guid: 1df5e004422d4cc4d94bdac404ea0d7d, type: 3}
|
||||
- {fileID: 21300000, guid: abac787697c283d4a8731efbca8afc6e, type: 3}
|
||||
- {fileID: 21300000, guid: 45066738ca7155c4c9233eb83fa79ac5, type: 3}
|
||||
- {fileID: 21300000, guid: 73b8ecbe6931f6e4ebcb270f87f94e5f, type: 3}
|
||||
- {fileID: 21300000, guid: 88acb6cbb57125445bf6c422d38018f3, type: 3}
|
||||
- {fileID: 21300000, guid: 1e16976e2a9c613419897c337ad731ad, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1.6666667
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 1
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 43bb99ab7e73d574eb53c09b524421f7
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1 +1 @@
|
|||
eNq12M9rE0EUwPF7of+DzNU5zJud3ez2lqYeelCK9RaCLM2qgbRbtlslSKEUBEU91hQteJJ60OpR4o/+M90N+S8cSRPyZBcy8N4tszvL7Ifwhce2V1faoJQCeeu5eNjrirXpSmzEA7HWBhlI1ZHiwWA/sbekuBfv2h+iPPs4+XpSvPpWnn8RdnNysGOvFr+Oi4vXxYtPk+Hn8eiiubirfHlWvhvavetxnveTu0n+JLWnieZO3nuabOdxtp0e9lvp/sDu2YqzePfAni/ArkDYN7ifPIuzbjPL7FX7pvn80a0ks+/aSvce9R7fnu4Ss+2b9gQlRSs93LMPqCPZOerIG7FGYl0t1kuJx5fHxdtTQrFmEXtI7FWLveX+4w/fJ+//EIo9FrFBYlMtNkuJr68ux7+HhGLDIvaR2J+JNRL7bh2vE4g1W8cBEgfV4sCtYyoxT8cNJG5UixtuHVOJeToOkTisFoduHVOJeTqOkDiaiT0kjtw6bhGIPa6OQS2K7apS/O+6S8hUZJaQAQ1dADVkcCuZisxSMqCpC3QNWbulTEVmSRnQ2AXzsctgsufW8gYB2bC1jOYuMDVk49YyFZmnZTR4gV9D9t1apiLztIwmLwhqyIFby1RknpbR6AXz0cvH5IZby3cIyD5by2j2grCGHLq1TEXmaRkNXxDVkCO3lqnILC1rNH1pVU3Wyq1lKjJLyxpNX3rhk5eWnjTSr/v09eakPB/NNTfy6x8/x6Or/+5VSje7/WR6Q9CiOqsrfwEj+2Gc
|
||||
eNq12M9rE0EUwPF7of+DzNU57Mxu0qS3JPXQg1Ks4CEEWZtVA2m3bLZKkEJaEAyNP6C0KRrwVFNBW2+WNLb/THbXnPovOJDskKcWhHnvlt2ZZPfD8IVHyvNzZWFZluC3XrJHtSpbnFyxJbfJFsuCZ7lV4exBc9NTS5zdc9fVBxYffRp/243aZ3HvK1ObvcaauhsNW1F/L3p1PO6eJIN+YXZX/PooPuyqvUU3DOveXS985qunscJaWHvurYZusOpv1Uv+ZlPtWXEDd72hns+EuhJMvcF974UbVAtBoO6qNw31V1e8QL1ryd94Unt6e7KLpduX1RMszkr+1ob6grXNK9sVPhVLIJYm4uS0Fb05QBRLErENxLbRGX/8Pv5wiSi2ScQOEDsm4tHVafKziyh2SMQZIM6kYmnScRFBLMk6zgJx1kSsO8YS03S8AMQLRmecdowlpuk4B8Q5E7HuGEtM03EeiPOp2DbpuIQgtqk6FtasWF0ZiHXHWGKSjgWYuYQwOuO0YywxSccCzFxCmoh1x1hiko4FmLmEnrkck46XEMQOWcdg5hKOiVh3jCWm6RjMXCJjdMZpx1himo7BzCWyJmLdMZaYpmMwcwk9c2VMOr6DIM6QdQxmLpEzEeuOscQ0HYOZS+SNzjjtGEtM0rEEM5e0TMS6YywxSccSzFxy5n8uyW3u8Bvlnd24N9CaqXx0fpEMrv5Y+6d0uVr3JguMAAXGKin/FzU6P0wOOo/9RuOvw9QrE1b0vn897ETvzkYXx7/e/oguu8lJK+61k/aXaH8n2v98Pdy5if7QD+rVovqp6Slj6ivzc78By/7EWQ==
|
|
@ -1 +1 @@
|
|||
eNrdls9rE0EUx++F/g8y5xx286ttjokplJCwmNBLKTJJprKwuxN3N5UgQg0I1lY8iKaWYPHQg6iteqg1iv4zyWzyX7jJpruZnZmkqdiCx8m8fPd9vm9m3ttYXNiQJUmSI7cegrtqFaS8FShAHYEUyEPVKNrYbBSwqUMtDW1bQyACbiOr4m53z384nd/kzclg55A8PSCvW+6eF1Rq1FwBV2ldrQwFMrjWuIMeYLM6KevFjkNGulsI2lRsBus6NrwNN6KAUDVrIPNeA6Ri3jKNLeviJykCMtAoIaiDlG3WUQTk1dEyj/QyMkcZeR8tVpCBxpjksElaZ93z587R8eDxS/BoMzI2JkoZE2WNyWqqjfi+OF9/9fe+/J++xChfYqwvw4/zbSm7OzdgivzvTYlTpsR9U0qmCrVhnmFD+qevnObP7ve9Xvsz15Io35KQ4DyW+MBbULM4xAFNgqJJ+DS8yqZFNY3xAQKNqbkHYVRJJ2soz6xhQJSkiJI+0SrUVY17YnsnZ6T1QkiX4NOF9aYyhoPZSs3CWqKwlibuolHXsvfrai2MRXb3et+OuUhJ0SWkta505LggsQBkmQJZ9kEUZFrYgJqyzZA4H96SZzu9dod/fQRPCiM4FYeJ9snWLGVdueCadbOG4au4XFaryFCwrWLD+2fAv0LxrwT8uTC2kguTSgLS3Pz14lPNOIWyNJm8uxKMEGtVjWmXZL9J3AqOxogQV3xGTwjk/qJZXpqRGpNkWTANiBG9ieD6EQMCap6Ro/y+LQYY9u5rT3+iANTYIQdjR7EGK6hkwm3EzKhur3bed0jrSf/dPv+REDRZRnNq/kz03O+4TI0PcjA+FG1oFnGdJTs4Gnxq9nZPSfsjn0zQfWnBK5dFuhzb5uLCH7K1ZyA=
|
||||
eNrdlk9rE0EYxu+FfgfZcw47+dc2x8QUSkhYTKiHUmSSncrC7k7c3VSCCDUgWBvxIG1qCRYPPYjaqodao+iXSWaTb+Emm+5kdmcTU2kFj5t58+z8nndm32djcWEDiKIIIrceCfcUWUi5T0IBakhICXmo6EULG/UCNjSopqFlqUiICLeRWXGWuxff7c4v8vp0sHNEnh2Sg5az5haV6lVHwFFaVypDgQyu1u+gh9iQJ2Xd2nHJSHcLQYupzWBNw7q74FQUEJKzOjLu14VUzH1MY9O8/EmMCBmolxDUhJRl1FBEyCujxzzSysgY7ch9abGCdDTGJEcN0jrvXrywj08GT14JjzcjY2OijDHRoDFZVbEQ3xf7y8/+3uf/05cY40ss6Mvw5Xxbys7KPzAFXL8pccaUuGdKyVCgOtyn35D+2b7d+NH9ttdrf+JaEuVb4hOcxxIPeAuqJoeY0iQYmoRHw+tsOqynMT4A1Zi6d1rGtHSyh2BmDylRkiFKekSrUFNU7ontnZ6T1stQugSfzq83ldFfHOzULKwlBmtp4i7qNTX7oKZU/Vhkd6/39YSLlAy7hKzWlY4cFyRGQZYZkGUPREKGiXWoStsBEvv9G/J8p9fu8K9PyCclIDgVJ1Dtka2Z0rp0yTXrZg3LV3G5rMhIl7ClYN39J+VfYfhXKH/Ojy3l/KRiCGlu/n7xqWacQiBObt55CokQa7IaGJek2SBOB0cxwscVnzETqNxfDMs/ZmRiEgAhaSAc0U0EN49ICZg8A6L8uR0OMJzdN779iQYwsQPQ2FGswgoqGXAbBTKqM6vtdx3Setp/2+R/JEKGbEBz6v4D1XN/xwETHwCND0ULGkVcC5IdHg8+Nnq7Z6T9gU8WMn1ZwSu3RZyDjQkTgIaJu9hQZX5WPLD3m5zzFg05cD6lqVS+2rlatbm48Bvso64O
|
|
@ -1 +1 @@
|
|||
eNqF2r2O3GQUh/E+Uu4Bbb2Fz9f7wR2ko6CLIgpIkQIJIRqEuHcGVhn/bZ0nbJUFPZ7d4589npN8fP/uox2HvX7318tPX355+f6/b15+/PO3z48/v758+OPzrx8e/9kPr/X68sPvX35+/I/19vX3p9e33DV3yDfmoXn0+TgwT80TcsO8NK8mNzsi7/0zH5oPyv2Z262f2k/o6+z91i/tF/Q7z9d/jPLt63mIrYfYdIj6xiHskEM8voFDjG8dQg2a0SHmtw6hDs3//1Q2h1CL9rTocgh/HCLOQ2isEi0pPs+Fa6wOrSg+z0JprAptUDwuP/ZZq0GbVM/Lz33WKtAW1evyg5+14rNN9W4H7srOD4jraAfuCs6NYmsH7krNnWLvB+6qzElZRT9wV2ZOzCr7gbs6c3JW1Q9cnTk5q9EPXJk5MavZD1yVOSmT96jrwFWZkzJ5i7oMPJRZEDN5h7oMPNRZkDN5g9KBhzoLcja8HXgosyBmI9qBhyoLUjayH3iosiBlo2DgyiyI2RgwcHUW5Gz2wkOdBTmbvfBQZkHMZi88VVmSsgnCU5UlKZsgPJVZErMFwlOdJTlbvfBUZ0nOVi88lVkSs9ULT1WWpGyB8FRlScoWCE9llsRsgfBUZ0nO1mwHXuqsyNla7cBLmRUxW7sdeKmyImX76AdeqqxI2bZ+4KXMipht7wde6qzI2e4fC0udFTnb/WNhKbMiZrt/LCxVVqRsw2NhqbIiZRseC4cyG8Rsw2PhUGcDnNXoBz7U2XCK+4EPZTaC4nPgobEqG0nxOfDUWJGNorh/9xiKbAyKz3EPjRXZmBSfV/XUWJENQFZTPr9rrMbGpvi8qLfEU4nNg2J4CJ9KbBKxKcTU2FRjk4xN/dyttSKbhEwfUVTZVGWTlMkziimzqcwmMZOHFFNnU51NcqZPKQptKrT5hBa6qzlWwQlTaHNBDDezqdDmhnj28VJo64AYnsyWOlsG8YZYmS3vY3rHXKpsBcQGsSJbCTFcW0uNrYI4IFZia0AMj2VLhS0QtkHYUmELhNHb5VJhC4RtELZV2O6F2YTzvFXYNojhPG8Vth1iOM9bhe2AGM7zVmE7IYbzvFXYLojhPG8VtnthPuhUqbDdC3P8sVXYJmFwJ9kqbJOw/k7y+PMZ//tNO7DjgNg0BmGHQewag7DDIQ6NQdgREKfGIOxIiEtjEHYUxEPjAfGAeGo8IZ4QL40XxAvirfGGGITpXwKYgTADYbr+N6N7GAxMF/9mdA+DgenK34zuYTAwXfmb0T2MBqbCDIQtGpgKMxC24JLUjb8Z3MMG/c4qzBbcAOHC0H2/GQhLGJju+817YU5Xle77zQ1iQKL7fnOHGAam637zgJh+ZxXmvTCnq0qX/eYFMSDRZb85vEsa3Ld12W8Owgzu27rsNwdhBvdt3fWbb4iBp676LUCYw3nWTb8FCHM4z7rptwBhAedZN/0WICzgPOum3wKEBZxnXfRbgLCA86x7fgsQFnCedc1vAcKCzrMKi07Y/a/NL7USi001vLYu+i0PquE2pot+S6Ma7mO66Lf0vk6n11ZmGVTTa6uzTKrh4tJVv2X19XI4Y7rrtxxU0++t1M5df15nbpdd/7NVaeem/9b6aFt1du75b+3189XXVtf8dq757212r6tbfju3/Hn5oCEP3fvx9WxV2LnkT7r9lrys8jo3/Lf0sjx9pmrrXO/f0tmmCuvc7d/S1aaq6tzs39LdpkqqZp/6ZWn6TFVULUitTRVUbUi9S3Wfb+OANNpUOQ2DNC8Lx2ernAZw8upb9TTAk17z2iqoAaB89q2KGr0ok39OY+e/5zLd49sAUvIx3b+2n96/+wfYqBAG
|
||||
eNqF2buOHFUURuHckt8BTTxB7du58AbOCMgsiwAcOEBCiAQh3p0Ga/qsbu3fTOSxtWrau76uqt7z8f27j3Zd9vrdXy8/ffnl5fv/vnn58c/fPt/+/Pry4Y/Pv364/bVfXuv15Yffv/x8+4f19evvT69fc2fuIt8yD+bR5+OSeTJPkZvMi3k1udkV+dzf88F8qNzvuT31k/0UfZ3en/rFfol+5/n5t1F+/bofYvMQWx2ivnEIu3CI2zfiEONbh6BBM3WI+a1D0KH5/5/K5hC0aHeLjkP47RBxDsGYEi1VfM6FM6ZDKxWfs1CMqdCGisfDyz41DdpU9Xx43aemQFuqXg8v/NTEZ1vVux24k51fIq6rHbgTnJuKrR24k5q7ir0fuFOZK2UV/cCdzFwxq+wH7nTmyllVP3A6c+WsRj9wMnPFrGY/cCpzpQz3qMeBU5krZbhFPQw8yCwUM9yhHgYedBbKGW5QHHjQWShnw9uBB5mFYjaiHXhQWShlI/uBB5WFUjZKDJzMQjEbQwyczkI5m73woLNQzmYvPMgsFLPZC08qS6VsCuFJZamUTSE8ySwVsyWEJ52lcrZ64UlnqZytXniSWSpmqxeeVJZK2RLCk8pSKVtCeJJZKmZLCE86S+VszXbgRWelnK3VDrzIrBSztduBF5WVUravfuBFZaWUbesHXmRWitn2fuBFZ6Wc7f6xsOislLPdPxYWmZVitvvHwqKyUsq2eCwsKiulbIvHwkFmQzHb4rFw0NkQzmr0Ax90NlzF/cAHmY1Q8Rl4MKaykSo+A0/GRDZKxf3dYxDZGCo+4x6MiWxMFZ939WRMZEMgq4nP74xpbGwVnzf1RjxJbF4qFg/hk8SmIjZBjMYmjU1lbPJzN2simwoZH1GobFLZVMrwjGJkNslsKmZ4SDE6m3Q2lTM+pRDaJLR5hxbc1Vy4Z9ZZdEwym0uko02JbG6Rzi5dJLYuka42pa9lIt1tSlzL+xT3SaaUtUKk1qZktVKk3qY0tUqk0aYEtYZIs02paQlNu9W0qGkJTbvVtKhpCU271bSpafeabLbndVPTNpG253VT03aRtud1U9MOkbbndVPTTpG253VT0y6Rtud1U9PuNfnoTw417V6TixdMTVtpWg874HtLTltx2l17ux+d9t9v2kFdV98aWwHqsr51tkLU5X0bbAWpK/o22QpTV/ZtsRWorurbwXaIdvTtZDtFO/t2sV2iXX272W7R9q64zjcTrqx3xT2+mbpQ9bPiAt9MXan6WXFzb6YuVf2suLg3U9cqMSu6MuFqiVnRlQlXq38PcmlvJi5XQ/x/6cqWuNT17wUu7M2EK+7rB2Iu7M17WH51t13jut7cRHpsTKRk5S7SM6qNlKo8RIr/raGlKu9VOd9FgZaqvEQLGZwUVbm4BxquzhwVVblQZbg6c1ZU5UKV4VM3Z0VVvkVLkW8ll/MWgpT3W1Pjbt5CoPItYrIKwSouERNWCFhhIqasELLCRUxaIWhFiJi2QtiKFDFxhcAVJWLqik7X0y+6Hb8mN27mLbaqq6+5mre8VD1ETWRpqp6iprL0vk7nr9YRU1mGivs7Kjfzlqni89ZKxlSW1cfLH07XvSWyHKod/T2Gi3k7i/l8HLc9LObvLZGdtfxT66NtSews5Z/a+fDGemu5k7ezk39us/u5XMnbWcnnwwcIPFDv29e9Ja6zkU912S38WNI66/in9GHTeU8J6+zin9LZpmR1FvFP6WpTqjpr+Kd0tylJ1exTf9hw3lOKqiVSa1OCqi1S71Iu321cIo02JadhIs2H7eC9JachOHn1LT0N4YnvebYENQQon31LUaMXZdlfIbl0tyFI4fO3v7Wf3r/7Bzy1Be0=
|
|
@ -1 +1 @@
|
|||
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
|
|
@ -1 +1 @@
|
|||
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
|
|
@ -1 +1 @@
|
|||
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
|
|
@ -0,0 +1 @@
|
|||
eNqL5uWKNjQwMNRRqFaKz0xRsgJzlPwSc1OVrJRetK993j39eXPT0yX9SjpKvvl5xSWpRZ5AZdEWYIVIZGxtrA4vVywvFwBL4xkp
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 49decbaf2e4bf114e815c20f3b0d7997
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 42 KiB |
|
@ -0,0 +1,96 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fc9329bdc55fc7043b235a417ab4f00e
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -132,6 +132,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -102,6 +102,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -102,6 +102,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
@ -126,7 +127,7 @@ SpriteRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: cadc3a2d23a63ce41835b11a7890cd73, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 8002cebb470746d4c817050ee58c63e0, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
|
|
|
@ -102,6 +102,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -132,6 +132,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -132,6 +132,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -132,6 +132,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -102,6 +102,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -132,6 +132,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -102,6 +102,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
|
@ -72,6 +72,7 @@ SpriteRenderer:
|
|||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|