shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks

Browse Source
This commit is contained in:
舒荣森 2024-10-31 02:56:21 +08:00
commit 6e64f4d87e
14 changed files with 393 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meng_yao/Assets/Resources/preform/gui/Swap_items_money.prefab
View File

@ -419,6 +419,7 @@ GameObject:
- component: {fileID: 5773240567442293872}
- component: {fileID: 1814994402487322620}
- component: {fileID: 1088692997626616511}
- component: {fileID: 7888541748188732454}
m_Layer: 5
m_Name: Swap_items_money
m_TagString: Untagged
@ -447,7 +448,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 401, y: -584}
m_SizeDelta: {x: 802, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5773240567442293871
MonoBehaviour:
@ -527,6 +528,33 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &7888541748188732454
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5773240567442293874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5f05f4b390610b45b78dd10cb4e88c0, type: 3}
m_Name:
m_EditorClassIdentifier:
boxType:
Name:
textName:
prompt:
is_required: 0
content:
Type: 0
icon: {fileID: 0}
details:
button_0_text:
button_1_text:
textobj: {fileID: 0}
promptobj: {fileID: 0}
contentobj: {fileID: 0}
iconobj: {fileID: 0}
--- !u!1 &5773240567800779687
GameObject:
m_ObjectHideFlags: 0

28
meng_yao/Assets/Resources/preform/gui/Swap_items_name.prefab
View File

@ -263,6 +263,7 @@ GameObject:
- component: {fileID: 3355888685892619978}
- component: {fileID: 7474865447946440006}
- component: {fileID: 8185285506328252421}
- component: {fileID: -1004878669720180061}
m_Layer: 5
m_Name: Swap_items_name
m_TagString: Untagged
@ -371,6 +372,33 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &-1004878669720180061
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3355888685892619976}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5f05f4b390610b45b78dd10cb4e88c0, type: 3}
m_Name:
m_EditorClassIdentifier:
boxType:
Name:
textName:
prompt:
is_required: 0
content:
Type: 0
icon: {fileID: 0}
details:
button_0_text:
button_1_text:
textobj: {fileID: 0}
promptobj: {fileID: 0}
contentobj: {fileID: 0}
iconobj: {fileID: 0}
--- !u!1 &3355888686146771229
GameObject:
m_ObjectHideFlags: 0

167
meng_yao/Assets/Resources/preform/gui/Swap_items_number.prefab
View File

@ -91,6 +91,7 @@ GameObject:
- component: {fileID: 3522186619341923616}
- component: {fileID: 3522186619341923630}
- component: {fileID: 3522186619341923617}
- component: {fileID: 8942752402538776368}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
@ -156,6 +157,50 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8942752402538776368
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3522186619341923619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3522186619341923617}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &3522186619360982678
GameObject:
m_ObjectHideFlags: 0
@ -167,6 +212,7 @@ GameObject:
- component: {fileID: 3522186619360982679}
- component: {fileID: 3522186619360982677}
- component: {fileID: 3522186619360982676}
- component: {fileID: 4386566697712776260}
m_Layer: 5
m_Name: Image (2)
m_TagString: Untagged
@ -232,6 +278,50 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4386566697712776260
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3522186619360982678}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3522186619360982676}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &3522186619381609934
GameObject:
m_ObjectHideFlags: 0
@ -305,7 +395,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
m_HorizontalOverflow: 1
@ -323,6 +413,7 @@ GameObject:
- component: {fileID: 3522186619504334520}
- component: {fileID: 3522186619504334662}
- component: {fileID: 3522186619504334521}
- component: {fileID: 8124619548067126509}
m_Layer: 5
m_Name: Swap_items_number
m_TagString: Untagged
@ -395,6 +486,33 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &8124619548067126509
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3522186619504334523}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5f05f4b390610b45b78dd10cb4e88c0, type: 3}
m_Name:
m_EditorClassIdentifier:
boxType:
Name:
textName:
prompt:
is_required: 0
content:
Type: 0
icon: {fileID: 0}
details:
button_0_text:
button_1_text:
textobj: {fileID: 0}
promptobj: {fileID: 0}
contentobj: {fileID: 0}
iconobj: {fileID: 0}
--- !u!1 &3522186619773485409
GameObject:
m_ObjectHideFlags: 0
@ -474,7 +592,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1
m_Text: "\u8BF7\u8F93\u5165"
--- !u!1 &3522186620730848507
GameObject:
m_ObjectHideFlags: 0
@ -633,6 +751,7 @@ GameObject:
- component: {fileID: 3522186620771686158}
- component: {fileID: 3522186620771686156}
- component: {fileID: 3522186620771686159}
- component: {fileID: 5805334125584608363}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -698,3 +817,47 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5805334125584608363
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3522186620771686145}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3522186620771686159}
m_OnClick:
m_PersistentCalls:
m_Calls: []

14
meng_yao/Assets/Scenes/cultivation_Jinsha_mine_slices.unity
View File

@ -600,6 +600,7 @@ GameObject:
- component: {fileID: 109717919}
- component: {fileID: 109717918}
- component: {fileID: 109717922}
- component: {fileID: 109717923}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@ -703,6 +704,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e5478f99215826a47acb0f80b32273ca, type: 3}
m_Name:
m_EditorClassIdentifier:
go: {fileID: 109717923}
--- !u!114 &109717923
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109717917}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f60fc87924edb64ba5073ca0de5ec28, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &138158026
GameObject:
m_ObjectHideFlags: 0

13
meng_yao/Assets/Scenes/main_scene.unity
View File

@ -202,6 +202,7 @@ GameObject:
- component: {fileID: 275582388}
- component: {fileID: 275582387}
- component: {fileID: 275582386}
- component: {fileID: 275582390}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@ -293,6 +294,18 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &275582390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 275582385}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0d037404676f94408d73bb6199200aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &304400296
GameObject:
m_ObjectHideFlags: 0

3
meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs
View File

@ -111,6 +111,9 @@ public class input_box_pop_up_window : MonoBehaviour
else if (boxType.Type == 5)
{
prefab = Resources.Load<GameObject>("preform/gui/item_button_1");
}else if (boxType.Type == 6)
{
prefab = Resources.Load<GameObject>("preform/gui/Swap_items_number");
}
GameObject ranking_list_item = Instantiate(prefab, Vector3.zero, Quaternion.identity);

72
meng_yao/Assets/script/ConnactServer/InitInfo.cs Normal file
View File

@ -0,0 +1,72 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class InitInfo : MonoBehaviour
{
// Start is called before the first frame update
private async void Start()
{
string response = await web.SendRequest("http://47.109.133.52/Item/GetList", "POST");
Debug.Log(response);
}
// Update is called once per frame
void Update()
{
}
}
/// <summary>
/// 获取所有商品数据
/// </summary>
public class LevelUpNeedItem
{
public int Num;
public int Count;
}
public class LevelUpNeedThing
{
public int Gold;
public List<LevelUpNeedItem> Items;
}
public class Character
{
public int Num; // 角色编号
public string Name; // 角色名称
public float Hp; // 生命值
public float HpUpMul; // 生命值成长倍率
public float Attack; // 攻击力
public float AttackUpMul; // 攻击力成长倍率
public float Defense; // 防御力
public float DefenseUpMul; // 防御力成长倍率
public float AttackSpeed; // 攻击速度
public float AttackSpeedUpMul; // 攻击速度成长倍率
public float Move; // 移动速度
public float MoveUpMul; // 移动速度成长倍率
public List<int> Skill; // 技能ID列表
public int Attribute; // 角色属性
public string LevelUpNeedThingsJson; // 升级所需物品的JSON字符串
public string Expand; // 扩展字段（用于未来扩展或附加数据）
public int Type; // 角色类型
public int Rarity; // 角色稀有度
public string WeaponBulletEffectPath; // 武器子弹效果路径
public string WeaponBulletHitEffectPath; // 武器子弹命中效果路径
public int UltimateSkill; // 终极技能ID
public int Access; // 获取途径或可用性
public List<string> SellDate; // 售卖日期列表（如果适用）
}
public class CharacterListResponse
{
public List<Character> List;
public int ErrorCode;
public string ErrorMessage;
}

11
meng_yao/Assets/script/ConnactServer/InitInfo.cs.meta Normal file
View File

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

40
meng_yao/Assets/script/ConnactServer/JinShaBuy.cs
View File

@ -26,10 +26,12 @@ public class Item
public List<float> ReferrerBouns;
public string CreateDateTime;
}
public class JinShaBuy : MonoBehaviour
public class JinShaBuy : mount
{
public int number=1;
// Start is called before the first frame update
void Start()
{
@ -41,4 +43,38 @@ public class JinShaBuy : MonoBehaviour
{
}
public void Show_buy()//注册界面
{
List<BoxType> boxTypes = new List<BoxType>();
boxTypes.Add(new BoxType { Name = "account_number", textName = " 数量", prompt = "请输入购买数量", Type = 6, is_required = true });
boxTypes.Add(new BoxType { Name = "submit", textName = " 取消购买 ", Type = 2 });
GameObject gameObject = add_pop_up(true);//生成弹窗母体
List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "购买");//测试输入框回调处理
gameObjects[1].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
{
if (type == 0)
{
gameObject.GetComponent<input_box_pop_up_window>().destroy();
}
else if (type == 1)
{
string response = await web.SendRequest("http://47.109.133.52/MinerElf/GetList", "POST");
Debug.Log(response);
Debug.Log(boxTypes[1].content);
//number = int.Parse(boxTypes[0].content);
}
});
}
}

4
meng_yao/Assets/script/cultivation_Jinsha_mine_slices/jinsha.cs
View File

@ -8,6 +8,7 @@ public class jinsha : mount
public delegate void OnClikeWT(int type,int num);
public event OnClikeWT OnType;//点击事件
public JinShaBuy go;
private void Awake()
{
intance = this;
@ -59,7 +60,8 @@ public class jinsha : mount
{
if (type == 1)
{
OnType?.Invoke(0, 1);
Debug.LogError("弹窗界面，但是有bug");
go.Show_buy();
}
});
gameObjects[2].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消

6
meng_yao/Assets/script/cultivation_Jinsha_mine_slices/room.cs
View File

@ -37,16 +37,10 @@ public class room : mount
}
ChangeTextPro();
}
private void OnEnable()
{
if (toolsNumber_text == null) return;
jinsha.intance.OnType += addman;
jinsha.intance.OnType += addtools;
}
private void OnDisable()

18
meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs
View File

@ -64,13 +64,14 @@ public class landContorl : MonoBehaviour
HightLight.SetActive(false);
if (!isGoldLand) return;
shopman.instance.OnType += addman;
}
private void OnDisable()
{
if (!isGoldLand) return;
shopman.instance.OnType -= addman;
}
@ -108,7 +109,7 @@ public class landContorl : MonoBehaviour
if (!isbuy)
{
Promptmgr.Instance.PromptBubble("还没有船", Color.black, Color.red);
Promptmgr.Instance.PromptBubble("还没有买船", Color.black, Color.red);
return;
}
@ -126,6 +127,10 @@ public class landContorl : MonoBehaviour
PlayerManager.Instance.SetMoney(MoneyType.Stones, -FishPrice);
}
//调用协议方法
Agreement();
fishMan = GameObject.Instantiate(fishManPrefab);
//fishMan.transform.SetParent(startPos);
fishMan.transform.position = startPos.position;
@ -283,8 +288,6 @@ public class landContorl : MonoBehaviour
fishMan.GetComponent<shipcontorl>().ChangeLookat(180f); // 朝向左边
}
}
void AddGold()
{
Debug.LogError("返航完成,开始：真·摸-鱼，加钱");
@ -292,4 +295,11 @@ public class landContorl : MonoBehaviour
goldNumerTextPro.text = goldnumer.ToString();
fishMan.GetComponent<shipcontorl>().SetState(ShipState.draw);
}
public async void Agreement()
{
string response_2 = await web.SendRequest("http://47.109.133.52/FisherElfActive/GetListOfGold", "POST");
Debug.Log(response_2);
Debug.Log("调用协议");
}
}

1
meng_yao/Assets/script/cultivation_gold_coin_Island/shopman.cs
View File

@ -18,6 +18,7 @@ public class shopman :mount
//关闭摄像头逻辑
Cinemachine_2dCon.SetCameraContorl(false);
Debug.LogError("禁用生成船只逻辑");
List<BoxType> boxTypes = new List<BoxType>();

2
meng_yao/Assets/script/sys/loading.cs
View File

@ -8,7 +8,7 @@ public class loading : MonoBehaviour
void Start()
{
mount.mountitem.login_screen();
// mount.mountitem.login_screen();
}
// Update is called once per frame