Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
This commit is contained in:
commit
d7890c8dd8
@ -361,7 +361,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 90e9cd2fc0a74084fbf1a89015db94a9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
bulletPrefab: {fileID: 900173028918561104, guid: 99830c598e775fb42b39abf253c5f084, type: 3}
|
||||
bulletPrefab: {fileID: 900173028918561104, guid: c7974614ec6f2d049b979213fb16ada5, type: 3}
|
||||
role: {fileID: 8433650274028726420}
|
||||
damageTyp: 2
|
||||
attackCooldown: 1
|
||||
@ -414,7 +414,7 @@ GameObject:
|
||||
- component: {fileID: 8433650274028726420}
|
||||
- component: {fileID: -3836672401185760439}
|
||||
- component: {fileID: 1608620729910401442}
|
||||
- component: {fileID: 3258498600701209889}
|
||||
- component: {fileID: 8431660328256440042}
|
||||
m_Layer: 0
|
||||
m_Name: mmg
|
||||
m_TagString: Player
|
||||
@ -509,7 +509,7 @@ MonoBehaviour:
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 3258498600701209889}
|
||||
mySkillUp: {fileID: 8431660328256440042}
|
||||
IsDead: 0
|
||||
HaveDieTime: 0
|
||||
enemyId:
|
||||
@ -566,7 +566,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
tower: {fileID: 0}
|
||||
Tag: tower
|
||||
--- !u!114 &3258498600701209889
|
||||
--- !u!114 &8431660328256440042
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -575,7 +575,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 8433650275485930554}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cf06a056a8f837740a4fca76de3a5ed5, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 4343d5a9d3f9c4246bb691da4aaa144d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
retbutton: {fileID: 0}
|
||||
|
@ -154,7 +154,7 @@ AnimationClip:
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events:
|
||||
- time: 0.73333335
|
||||
functionName: ShootBullet
|
||||
functionName: ShanXingAttack
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
|
@ -31606,27 +31606,27 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 600
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 733
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -366.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit f1d8219300474f47b57fcf3d3867062dfde97d80
|
||||
Subproject commit 5788bda1d2bc278bb1ab1a288344c13c16db84a0
|
59
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs
Normal file
59
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs
Normal file
@ -0,0 +1,59 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class mmg_SkillUp : SkillUp
|
||||
{
|
||||
/// <summary>
|
||||
///攻击CD减少25%
|
||||
/// </summary>
|
||||
public override void Skill_1_1()
|
||||
{
|
||||
base.AttackCooldown -= 0.25f;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 射程提升2格位置,攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_1_3()
|
||||
{
|
||||
|
||||
AttackCooldown += 0.05f;
|
||||
base.AttackRange = 2;
|
||||
attack.SetAttackRange();
|
||||
}
|
||||
/// <summary>
|
||||
/// 增加子弹20%飞行速度,攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_1_5()
|
||||
{
|
||||
AttackCooldown += 0.05f;
|
||||
base.attack.roleBulletSpeedAdd += 0.2f;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 每次射击2个子弹,增加扇形攻击范围
|
||||
/// </summary>
|
||||
public override void Skill_2_1()
|
||||
{
|
||||
base.attack.BulletNumber += 2;
|
||||
base.attack.Angle += 20;
|
||||
}
|
||||
/// <summary>
|
||||
/// 对小型敌人增加25%伤害,攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_2_3()
|
||||
{
|
||||
base.DamageOfMin += 0.25f;
|
||||
AttackCooldown += 0.05f;
|
||||
}
|
||||
/// <summary>
|
||||
/// 对小型敌人增加40%伤害,攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_2_5()
|
||||
{
|
||||
base.DamageOfMin += 0.4f;
|
||||
base.AttackCooldown += 0.05f;
|
||||
}
|
||||
}
|
11
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs.meta
Normal file
11
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4343d5a9d3f9c4246bb691da4aaa144d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ff6b29309c45aaa4da821da053e0861c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,45 @@
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
|
||||
public class Auctioncertificate: MonoBehaviour
|
||||
{
|
||||
public Dictionary<string, string> CreateHeaders()
|
||||
{
|
||||
if (string.IsNullOrEmpty(MyGlobal.global.loginResponse.Data.access_token))
|
||||
{
|
||||
Debug.LogWarning("尝试创建请求头时,token 未设置。");
|
||||
return new Dictionary<string, string>();
|
||||
}
|
||||
return new Dictionary<string, string>
|
||||
{
|
||||
|
||||
{ "Authorization","Bearer "+MyGlobal.global.loginResponse.Data.access_token },
|
||||
{ "client-info", "{\"platform\":\"ios\",\"phone_product\":\"apple\",\"phone_model\":\"iPhone_8\",\"system_version\":\"12.0\",\"screen_size\":\"750*1334\",\"device_no\":\"e3e277810fff9d955ebdd7037eff51a8\",\"version\":\"1.0.0\"}" }
|
||||
};
|
||||
}
|
||||
public async Task<certificateResponse> Island()
|
||||
{
|
||||
string response = await myWeb.SendRequest(myWeb.URL + "/api/island/cert_list", "GET", "{}", CreateHeaders());
|
||||
Debug.Log("岛主证书" + response);
|
||||
certificateResponse certificate = JsonConvert.DeserializeObject<certificateResponse>(response);
|
||||
//Debug.Log(teamInfo.Data.Info.Nickname);
|
||||
return certificate;
|
||||
}
|
||||
}
|
||||
|
||||
public class certificateResponse
|
||||
{
|
||||
public certificateData Data { get; set; }
|
||||
}
|
||||
public class certificateData
|
||||
{
|
||||
public string uid { get; set; }
|
||||
public string nickname { get; set; }
|
||||
public string serial_no { get; set; }
|
||||
public int copies { get; set; }
|
||||
public string island_name { get; set; }
|
||||
public string issue_date { get; set; }
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: acd9ea8f9fcf28f41ac1fe76a6a7e0a4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,46 @@
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
|
||||
public class Auctioninformation: MonoBehaviour
|
||||
{
|
||||
public Dictionary<string, string> CreateHeaders()
|
||||
{
|
||||
if (string.IsNullOrEmpty(MyGlobal.global.loginResponse.Data.access_token))
|
||||
{
|
||||
Debug.LogWarning("尝试创建请求头时,token 未设置。");
|
||||
return new Dictionary<string, string>();
|
||||
}
|
||||
return new Dictionary<string, string>
|
||||
{
|
||||
|
||||
{ "Authorization","Bearer "+MyGlobal.global.loginResponse.Data.access_token },
|
||||
{ "client-info", "{\"platform\":\"ios\",\"phone_product\":\"apple\",\"phone_model\":\"iPhone_8\",\"system_version\":\"12.0\",\"screen_size\":\"750*1334\",\"device_no\":\"e3e277810fff9d955ebdd7037eff51a8\",\"version\":\"1.0.0\"}" }
|
||||
};
|
||||
}
|
||||
public async Task<AuctionResponse> Island(int count)
|
||||
{
|
||||
|
||||
string response = await myWeb.SendRequest(myWeb.URL + "/api/island/submit", "GET", "{}", CreateHeaders());
|
||||
Debug.Log("岛主信息" + response);
|
||||
AuctionResponse Island = JsonConvert.DeserializeObject<AuctionResponse>(response);
|
||||
//Debug.Log(teamInfo.Data.Info.Nickname);
|
||||
return Island;
|
||||
}
|
||||
}
|
||||
|
||||
public class AuctionResponse
|
||||
{
|
||||
public AuctionData Data { get; set; }
|
||||
}
|
||||
public class AuctionData
|
||||
{
|
||||
public int gold { get; set; }
|
||||
public string intro_text { get; set; }
|
||||
public int countdown { get; set; }
|
||||
public int island_id { get; set; }
|
||||
public string island_name { get; set; }
|
||||
public int invest_total { get; set; }
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 82907bb754fe74643be310ebe0654f63
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,46 @@
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
|
||||
public class Islandownerbidding: MonoBehaviour
|
||||
{
|
||||
public Dictionary<string, string> CreateHeaders()
|
||||
{
|
||||
if (string.IsNullOrEmpty(MyGlobal.global.loginResponse.Data.access_token))
|
||||
{
|
||||
Debug.LogWarning("尝试创建请求头时,token 未设置。");
|
||||
return new Dictionary<string, string>();
|
||||
}
|
||||
return new Dictionary<string, string>
|
||||
{
|
||||
|
||||
{ "Authorization","Bearer "+MyGlobal.global.loginResponse.Data.access_token },
|
||||
{ "client-info", "{\"platform\":\"ios\",\"phone_product\":\"apple\",\"phone_model\":\"iPhone_8\",\"system_version\":\"12.0\",\"screen_size\":\"750*1334\",\"device_no\":\"e3e277810fff9d955ebdd7037eff51a8\",\"version\":\"1.0.0\"}" }
|
||||
};
|
||||
}
|
||||
public async Task<IslandResponse> Island(Islandbody islandbody)
|
||||
{
|
||||
Debug.Log("岛主竞拍入参" + JsonConvert.SerializeObject(islandbody));
|
||||
string response = await myWeb.SendRequest(myWeb.URL + "/api/island/info", "POST", JsonConvert.SerializeObject(islandbody), CreateHeaders());
|
||||
Debug.Log("岛主竞拍" + response);
|
||||
IslandResponse Island = JsonConvert.DeserializeObject<IslandResponse>(response);
|
||||
//Debug.Log(teamInfo.Data.Info.Nickname);
|
||||
return Island;
|
||||
}
|
||||
}
|
||||
|
||||
public class Islandbody
|
||||
{
|
||||
public int count;
|
||||
}
|
||||
public class IslandResponse
|
||||
{
|
||||
public IslandData Data { get; set; }
|
||||
}
|
||||
public class IslandData
|
||||
{
|
||||
public int balance { get; set; }
|
||||
public int invest_total { get; set; }
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 70cf240f9a42b134181a608af77f0995
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Loading…
Reference in New Issue
Block a user