From 89996fd8d6a478c02bb4dc27944ba875781529b8 Mon Sep 17 00:00:00 2001 From: chenxin <chenxin6991@163.com> Date: Tue, 27 Oct 2020 17:46:58 +0800 Subject: [PATCH] 打包 --- GemBattle/宝石塔防_Data/level3 | 0 GemBattle/宝石塔防_Data/resources.assets | 0 GemBattle/宝石塔防_Data/sharedassets0.assets | 0 GemBattle/宝石塔防_Data/level2 | 0 GemBattle/宝石塔防_Data/StreamingAssets/Table/battle.json | 2 +- GemBattle/宝石塔防_Data/globalgamemanagers.assets | 0 GemBattle/宝石塔防_Data/sharedassets2.resource | 0 GemBattle/宝石塔防_Data/globalgamemanagers | 0 GemBattle/宝石塔防_Data/level0 | 0 GemBattle/宝石塔防_Data/level1 | 0 GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0 GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json | 2 +- ProjectSettings/EditorBuildSettings.asset | 2 +- Assets/Scenes/LoadingScene.unity | 4 ++-- GemBattle/宝石塔防_Data/sharedassets2.assets | 0 /dev/null | 0 Assets/Materials/Guide/RectGuidance.mat | 2 +- GemBattle/宝石塔防_Data/StreamingAssets/Table/donaterule.json | 1 + GemBattle/宝石塔防_Data/sharedassets1.assets | 0 GemBattle/宝石塔防_Data/sharedassets3.assets | 0 GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_teachport.json | 1 + GemBattle.zip | 0 GemBattle/宝石塔防_Data/resources.assets.resS | 0 GemBattle/宝石塔防_Data/sharedassets2.assets.resS | 0 GemBattle/宝石塔防_Data/sharedassets3.assets.resS | 0 GemBattle/宝石塔防_Data/sharedassets1.assets.resS | 0 GemBattle/宝石塔防_Data/sharedassets0.assets.resS | 0 27 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/Materials/Guide/RectGuidance.mat b/Assets/Materials/Guide/RectGuidance.mat index 7d18417..46f4431 100644 --- a/Assets/Materials/Guide/RectGuidance.mat +++ b/Assets/Materials/Guide/RectGuidance.mat @@ -83,7 +83,7 @@ - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Center: {r: -150, g: -198, b: 0, a: 0} + - _Center: {r: 6, g: -198, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity index ced91bc..d1c28cc 100644 --- a/Assets/Scenes/LoadingScene.unity +++ b/Assets/Scenes/LoadingScene.unity @@ -410,7 +410,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 501810470} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5671a738ca063f047a1619ba0c199f45, type: 3} m_Name: @@ -1138,7 +1138,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2083383109} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c3c4a281008bfb42a6882852b64f3b7, type: 3} m_Name: diff --git a/GemBattle.zip b/GemBattle.zip index b785043..cba8e6f 100644 --- a/GemBattle.zip +++ b/GemBattle.zip Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" index 8749f28..013c4ec 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json" index a521429..f1ee002 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json" @@ -1 +1 @@ -[[1,"skilltime",30,[],"","生成技能宝石的时间(秒)"],[2,"initialgold",100,[],"","战斗内初始金币"],[3,"doublegem",180,[],"","购买宝石直接获得2级宝石的时间(秒)"],[4,"initialmoney",5000,[],"","初始金币"],[5,"initialgems","",["101:1:100","102:3:200","103:6:200","104:9:200","105:1:200","106:3:200","107:9:200","109:1:200"],"","宝石id:等级:个数 三个一组,每组用逗号分隔"],[6,"initialdeck","",["101","102","103","105","109"],"","上阵的宝石id列表.必须是初始宝石里面的"],[7,"buildtime",10,[],"","解锁塔位所需时间(秒)"],[8,"gemcountdown",10,[],"","购买获得2级宝石倒计时(秒)"],[9,"skillchance",20,[],"","购买获得技能宝石的概率(百分比)"],[10,"changenameprice",100,[],"","非首次改名的花费(100钻石)"],[11,"gemlevelup",30,[],"","塔防区宝石升级时变换类型的概率"],[12,"familymaxcount",50,[],"","工会最大人数"],[13,"scoreShopRefreshTime",7,[],"","工会积分商城刷新时间7天,从创建开始算"],[14,"SpeedUpFrist","",["180:0.75:1.5"],"","第一次提速时间,间隔倍率,移速倍率"],[15,"SpeedUpSecond","",["300:0.5:2"],"","第二次提速时间,间隔倍率,移速倍率"],[16,"donateShopRefreshTime",7,[],"","工会捐赠商城刷新时间7天,从创建开始算"],[17,"guildRankRequest","",["0","300","600","900","1200","1500","1800","2100","2400","2700","3000"],"","加入公会的排位分数限制(超过该值才能进入)"],[18,"guildNameDay",7,[],"","修改公会名:间隔7天1次"],[19,"guildNameCost",500,[],"","修改公会名:每次花费500金币(money)"],[20,"guildicon",30,[],"","修改公会图标:间隔30天1次"],[21,"guildCreateMinLevel",5,[],"","工会创建最小等级"]] \ No newline at end of file +[[1,"skilltime",30,[],"","生成技能宝石的时间(秒)"],[2,"initialgold",100,[],"","战斗内初始金币"],[3,"doublegem",180,[],"","购买宝石直接获得2级宝石的时间(秒)"],[4,"initialmoney",5000,[],"","初始金币"],[5,"initialgems","",["101:1:100","102:3:200","103:6:200","104:9:200","105:1:200","106:3:200","107:9:200","109:1:200"],"","宝石id:等级:个数 三个一组,每组用逗号分隔"],[6,"initialdeck","",["101","102","103","105","109"],"","上阵的宝石id列表.必须是初始宝石里面的"],[7,"buildtime",0,[],"","解锁塔位所需时间(秒)"],[8,"gemcountdown",10,[],"","购买获得2级宝石倒计时(秒)"],[9,"skillchance",20,[],"","购买获得技能宝石的概率(百分比)"],[10,"changenameprice",100,[],"","非首次改名的花费(100钻石)"],[11,"gemlevelup",30,[],"","塔防区宝石升级时变换类型的概率"],[12,"familymaxcount",50,[],"","工会最大人数"],[13,"scoreShopRefreshTime",7,[],"","工会积分商城刷新时间7天,从创建开始算"],[14,"SpeedUpFrist","",["180:0.75:1.5"],"","第一次提速时间,间隔倍率,移速倍率"],[15,"SpeedUpSecond","",["300:0.5:2"],"","第二次提速时间,间隔倍率,移速倍率"],[16,"donateShopRefreshTime",7,[],"","工会捐赠商城刷新时间7天,从创建开始算"],[17,"guildRankRequest","",["0","300","600","900","1200","1500","1800","2100","2400","2700","3000"],"","加入公会的排位分数限制(超过该值才能进入)"],[18,"guildNameDay",7,[],"","修改公会名:间隔7天1次"],[19,"guildNameCost",500,[],"","修改公会名:每次花费500金币(money)"],[20,"guildicon",30,[],"","修改公会图标:间隔30天1次"],[21,"guildCreateMinLevel",5,[],"","工会创建最小等级"]] \ No newline at end of file diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donaterule.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donaterule.json" new file mode 100644 index 0000000..b5b7a05 --- /dev/null +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donaterule.json" @@ -0,0 +1 @@ +[[1,[1,2,3],["10:1","1:2"],["2:1","1:2"]],[2,[4,5,6],["20:1","2:2"],["4:1","1:2"]],[3,[7,8,9],["30:1","3:2"],["6:1","2:2"]],[4,[10,11,12,13],["40:1","4:2"],["8:1","2:2"]]] \ No newline at end of file diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json" index 003cc10..b8814d3 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json" @@ -1 +1 @@ -[[1,1,"史莱姆大王",1,1,1,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[2,1,"史莱姆大王",1,1,2,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[3,1,"史莱姆大王",1,1,3,1,12,1500,200,1.5,2,3000,["gold:5"],[500,9500],1],[4,1,"史莱姆大王",1,1,4,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[5,1,"史莱姆大王",1,1,5,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[6,1,"史莱姆大王",1,2,1,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[7,1,"史莱姆大王",1,2,2,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[8,1,"史莱姆大王",1,2,3,3,6,3000,350,1.5,2,3000,["gold:5"],[500,9500],3],[9,1,"史莱姆大王",1,2,4,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[10,1,"史莱姆大王",1,2,5,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[11,1,"史莱姆大王",1,3,1,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[12,1,"史莱姆大王",1,3,2,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[13,1,"史莱姆大王",1,3,3,2,4,4500,500,1.5,2,3000,["gold:5"],[500,9500],2],[14,1,"史莱姆大王",1,3,4,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[15,1,"史莱姆大王",1,3,5,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[16,2,"捣蛋恶魔",2,1,1,0,0,0,1000,1.5,4,3000,["gold:5"],[500,9500],0],[17,2,"捣蛋恶魔",2,1,2,3,6,3000,1000,1.5,4,3000,["gold:5"],[500,9500],3],[18,2,"捣蛋恶魔",2,1,3,1,12,1500,1000,1.5,4,3000,["gold:5"],[500,9500],1],[19,2,"捣蛋恶魔",2,1,4,3,6,3000,1000,1.5,4,3000,["gold:5"],[500,9500],3],[20,2,"捣蛋恶魔",2,1,5,0,0,0,1000,1.5,4,3000,["gold:5"],[500,9500],0],[21,2,"捣蛋恶魔",2,2,1,2,4,4500,1200,1.5,4,3000,["gold:5"],[500,9500],2],[22,2,"捣蛋恶魔",2,2,2,0,0,0,1200,1.5,4,3000,["gold:5"],[500,9500],0],[23,2,"捣蛋恶魔",2,2,3,3,6,3000,1200,1.5,4,3000,["gold:5"],[500,9500],3],[24,2,"捣蛋恶魔",2,2,4,0,0,0,1200,1.5,4,3000,["gold:5"],[500,9500],0],[25,2,"捣蛋恶魔",2,2,5,2,4,4500,1200,1.5,4,3000,["gold:5"],[500,9500],2],[26,2,"捣蛋恶魔",2,3,1,2,4,4500,1400,1.5,4,3000,["gold:5"],[500,9500],2],[27,2,"捣蛋恶魔",2,3,2,3,6,3000,1400,1.5,4,3000,["gold:5"],[500,9500],3],[28,2,"捣蛋恶魔",2,3,3,1,12,1500,1400,1.5,4,3000,["gold:5"],[500,9500],1],[29,2,"捣蛋恶魔",2,3,4,3,6,3000,1400,1.5,4,3000,["gold:5"],[500,9500],3],[30,2,"捣蛋恶魔",2,3,5,2,4,4500,1400,1.5,4,3000,["gold:5"],[500,9500],2],[31,3,"精灵小偷",3,1,1,3,6,3000,1800,1.5,8,3000,["gold:5"],[500,9500],3],[32,3,"精灵小偷",3,1,2,1,12,1500,1800,1.5,8,3000,["gold:5"],[500,9500],1],[33,3,"精灵小偷",3,1,3,2,4,4500,1800,1.5,8,3000,["gold:5"],[500,9500],2],[34,3,"精灵小偷",3,1,4,1,12,1500,1800,1.5,8,3000,["gold:5"],[500,9500],1],[35,3,"精灵小偷",3,1,5,3,6,3000,1800,1.5,8,3000,["gold:5"],[500,9500],3],[36,3,"精灵小偷",3,2,1,1,12,1500,2100,1.5,8,3000,["gold:5"],[500,9500],1],[37,3,"精灵小偷",3,2,2,3,6,3000,2100,1.5,8,3000,["gold:5"],[500,9500],3],[38,3,"精灵小偷",3,2,3,2,4,4500,2100,1.5,8,3000,["gold:5"],[500,9500],2],[39,3,"精灵小偷",3,2,4,3,6,3000,2100,1.5,8,3000,["gold:5"],[500,9500],3],[40,3,"精灵小偷",3,2,5,1,12,1500,2100,1.5,8,3000,["gold:5"],[500,9500],1],[41,3,"精灵小偷",3,3,1,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[42,3,"精灵小偷",3,3,2,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[43,3,"精灵小偷",3,3,3,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[44,3,"精灵小偷",3,3,4,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[45,3,"精灵小偷",3,3,5,2,4,4500,2400,1.5,8,3000,["box:3:1"],[500,9500],2],[46,4,"大波僵尸",3,1,1,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[47,4,"大波僵尸",3,1,2,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[48,4,"大波僵尸",3,1,3,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[49,4,"大波僵尸",3,1,4,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[50,4,"大波僵尸",3,1,5,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[51,4,"大波僵尸",3,2,1,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[52,4,"大波僵尸",3,2,2,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[53,4,"大波僵尸",3,2,3,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[54,4,"大波僵尸",3,2,4,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[55,4,"大波僵尸",3,2,5,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[56,4,"大波僵尸",3,3,1,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[57,4,"大波僵尸",3,3,2,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[58,4,"大波僵尸",3,3,3,1,12,1500,3300,1.5,16,3000,["gold:5"],[500,9500],1],[59,4,"大波僵尸",3,3,4,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[60,4,"大波僵尸",3,3,5,2,6,3000,3300,1.5,16,3000,["box:3:1"],[500,9500],2],[61,5,"Dio",3,1,1,2,8,4500,3600,2,32,3000,["gold:5"],[500,9500],2],[62,5,"Dio",3,1,2,3,12,3000,3600,2,32,3000,["gold:5"],[500,9500],3],[63,5,"Dio",3,1,3,1,24,1500,3600,2,32,3000,["gold:5"],[500,9500],1],[64,5,"Dio",3,1,4,3,12,3000,3600,2,32,3000,["gold:5"],[500,9500],3],[65,5,"Dio",3,1,5,2,8,4500,3600,2,32,3000,["gold:5"],[500,9500],2],[66,5,"Dio",3,2,1,3,12,3000,3900,2,32,3000,["gold:5"],[500,9500],3],[67,5,"Dio",3,2,2,1,24,1500,3900,2,32,3000,["gold:5"],[500,9500],1],[68,5,"Dio",3,2,3,2,8,4500,3900,2,32,3000,["gold:5"],[500,9500],2],[69,5,"Dio",3,2,4,1,24,1500,3900,2,32,3000,["gold:5"],[500,9500],1],[70,5,"Dio",3,2,5,3,12,3000,3900,2,32,3000,["gold:5"],[500,9500],3],[71,5,"Dio",3,3,1,1,24,1500,4200,2,32,3000,["gold:5"],[500,9500],1],[72,5,"Dio",3,3,2,3,12,3000,4200,2,32,3000,["gold:5"],[500,9500],3],[73,5,"Dio",3,3,3,2,8,4500,4200,2,32,3000,["gold:5"],[500,9500],2],[74,5,"Dio",3,3,4,3,12,3000,4200,2,32,3000,["gold:5"],[500,9500],3],[75,5,"Dio",3,3,5,1,24,1500,4200,2,32,3000,["gold:5"],[500,9500],1],[76,5,"Dio",3,4,1,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[77,5,"Dio",3,4,2,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[78,5,"Dio",3,4,3,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[79,5,"Dio",3,4,4,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[80,5,"Dio",3,4,5,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[81,5,"Dio",3,5,1,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[82,5,"Dio",3,5,2,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[83,5,"Dio",3,5,3,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[84,5,"Dio",3,5,4,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[85,5,"Dio",3,5,5,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[86,5,"Dio",3,6,1,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[87,5,"Dio",3,6,2,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[88,5,"Dio",3,6,3,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[89,5,"Dio",3,6,4,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[90,5,"Dio",3,6,5,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[91,5,"Dio",3,7,1,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[92,5,"Dio",3,7,2,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[93,5,"Dio",3,7,3,1,24,1500,5400,2,64,3000,["gold:5"],[500,9500],1],[94,5,"Dio",3,7,4,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[95,5,"Dio",3,7,5,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[96,5,"Dio",3,8,1,2,8,4500,5700,2,64,3000,["gold:5"],[500,9500],2],[97,5,"Dio",3,8,2,3,12,3000,5700,2,64,3000,["gold:5"],[500,9500],3],[98,5,"Dio",3,8,3,1,24,1500,5700,2,64,3000,["gold:5"],[500,9500],1],[99,5,"Dio",3,8,4,3,12,3000,5700,2,64,3000,["gold:5"],[500,9500],3],[100,5,"Dio",3,8,5,2,8,4500,5700,2,64,3000,["gold:5"],[500,9500],2],[101,5,"Dio",3,9,1,3,12,3000,6000,2,64,3000,["gold:5"],[500,9500],3],[102,5,"Dio",3,9,2,1,24,1500,6000,2,64,3000,["gold:5"],[500,9500],1],[103,5,"Dio",3,9,3,2,8,4500,6000,2,64,3000,["gold:5"],[500,9500],2],[104,5,"Dio",3,9,4,1,24,1500,6000,2,64,3000,["gold:5"],[500,9500],1],[105,5,"Dio",3,9,5,3,12,3000,6000,2,64,3000,["gold:5"],[500,9500],3],[106,5,"Dio",3,10,1,1,24,1500,6300,2,64,3000,["gold:5"],[500,9500],1],[107,5,"Dio",3,10,2,3,12,3000,6300,2,64,3000,["gold:5"],[500,9500],3],[108,5,"Dio",3,10,3,2,8,4500,6300,2,64,3000,["gold:5"],[500,9500],2],[109,5,"Dio",3,10,4,3,12,3000,6300,2,64,3000,["gold:5"],[500,9500],3],[110,5,"Dio",3,10,5,1,24,1500,6300,2,64,3000,["gold:5"],[500,9500],1],[111,5,"Dio",3,11,1,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[112,5,"Dio",3,11,2,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[113,5,"Dio",3,11,3,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[114,5,"Dio",3,11,4,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[115,5,"Dio",3,11,5,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[116,5,"Dio",3,12,1,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[117,5,"Dio",3,12,2,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[118,5,"Dio",3,12,3,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[119,5,"Dio",3,12,4,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[120,5,"Dio",3,12,5,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1]] \ No newline at end of file +[[1,-2,"史莱姆大王",1,1,1,0,0,0,200,1.5,2,3000,["0"],[0],0],[2,-2,"史莱姆大王",1,1,2,0,0,0,200,1.5,2,3000,["0"],[0],0],[3,-2,"史莱姆大王",1,1,3,3,10,2000,200,1.5,2,3000,["0"],[0],3],[4,-2,"史莱姆大王",1,1,4,0,0,0,200,1.5,2,3000,["0"],[0],0],[5,-2,"史莱姆大王",1,1,5,0,0,0,200,1.5,2,3000,["0"],[0],0],[6,-1,"史莱姆大王",1,2,1,0,0,0,350,1.5,2,3000,["0"],[0],0],[7,-1,"史莱姆大王",1,2,2,1,10,2000,500,1.5,2,3000,["0"],[0],1],[8,-1,"史莱姆大王",1,2,3,0,0,0,350,1.5,2,3000,["0"],[0],0],[9,-1,"史莱姆大王",1,2,4,0,0,0,350,1.5,2,3000,["0"],[0],0],[10,-1,"史莱姆大王",1,2,5,0,0,0,350,1.5,2,3000,["0"],[0],0],[11,1,"史莱姆大王",1,1,1,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[12,1,"史莱姆大王",1,1,2,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[13,1,"史莱姆大王",1,1,3,1,12,1500,200,1.5,2,3000,["gold:5"],[500,9500],1],[14,1,"史莱姆大王",1,1,4,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[15,1,"史莱姆大王",1,1,5,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[16,1,"史莱姆大王",1,2,1,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[17,1,"史莱姆大王",1,2,2,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[18,1,"史莱姆大王",1,2,3,3,6,3000,350,1.5,2,3000,["gold:5"],[500,9500],3],[19,1,"史莱姆大王",1,2,4,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[20,1,"史莱姆大王",1,2,5,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[21,1,"史莱姆大王",1,3,1,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[22,1,"史莱姆大王",1,3,2,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[23,1,"史莱姆大王",1,3,3,2,4,4500,500,1.5,2,3000,["gold:5"],[500,9500],2],[24,1,"史莱姆大王",1,3,4,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[25,1,"史莱姆大王",1,3,5,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[26,2,"捣蛋恶魔",2,1,1,0,0,0,1000,1.5,4,3000,["gold:5"],[500,9500],0],[27,2,"捣蛋恶魔",2,1,2,3,6,3000,1000,1.5,4,3000,["gold:5"],[500,9500],3],[28,2,"捣蛋恶魔",2,1,3,1,12,1500,1000,1.5,4,3000,["gold:5"],[500,9500],1],[29,2,"捣蛋恶魔",2,1,4,3,6,3000,1000,1.5,4,3000,["gold:5"],[500,9500],3],[30,2,"捣蛋恶魔",2,1,5,0,0,0,1000,1.5,4,3000,["gold:5"],[500,9500],0],[31,2,"捣蛋恶魔",2,2,1,2,4,4500,1200,1.5,4,3000,["gold:5"],[500,9500],2],[32,2,"捣蛋恶魔",2,2,2,0,0,0,1200,1.5,4,3000,["gold:5"],[500,9500],0],[33,2,"捣蛋恶魔",2,2,3,3,6,3000,1200,1.5,4,3000,["gold:5"],[500,9500],3],[34,2,"捣蛋恶魔",2,2,4,0,0,0,1200,1.5,4,3000,["gold:5"],[500,9500],0],[35,2,"捣蛋恶魔",2,2,5,2,4,4500,1200,1.5,4,3000,["gold:5"],[500,9500],2],[36,2,"捣蛋恶魔",2,3,1,2,4,4500,1400,1.5,4,3000,["gold:5"],[500,9500],2],[37,2,"捣蛋恶魔",2,3,2,3,6,3000,1400,1.5,4,3000,["gold:5"],[500,9500],3],[38,2,"捣蛋恶魔",2,3,3,1,12,1500,1400,1.5,4,3000,["gold:5"],[500,9500],1],[39,2,"捣蛋恶魔",2,3,4,3,6,3000,1400,1.5,4,3000,["gold:5"],[500,9500],3],[40,2,"捣蛋恶魔",2,3,5,2,4,4500,1400,1.5,4,3000,["gold:5"],[500,9500],2],[41,3,"精灵小偷",3,1,1,3,6,3000,1800,1.5,8,3000,["gold:5"],[500,9500],3],[42,3,"精灵小偷",3,1,2,1,12,1500,1800,1.5,8,3000,["gold:5"],[500,9500],1],[43,3,"精灵小偷",3,1,3,2,4,4500,1800,1.5,8,3000,["gold:5"],[500,9500],2],[44,3,"精灵小偷",3,1,4,1,12,1500,1800,1.5,8,3000,["gold:5"],[500,9500],1],[45,3,"精灵小偷",3,1,5,3,6,3000,1800,1.5,8,3000,["gold:5"],[500,9500],3],[46,3,"精灵小偷",3,2,1,1,12,1500,2100,1.5,8,3000,["gold:5"],[500,9500],1],[47,3,"精灵小偷",3,2,2,3,6,3000,2100,1.5,8,3000,["gold:5"],[500,9500],3],[48,3,"精灵小偷",3,2,3,2,4,4500,2100,1.5,8,3000,["gold:5"],[500,9500],2],[49,3,"精灵小偷",3,2,4,3,6,3000,2100,1.5,8,3000,["gold:5"],[500,9500],3],[50,3,"精灵小偷",3,2,5,1,12,1500,2100,1.5,8,3000,["gold:5"],[500,9500],1],[51,3,"精灵小偷",3,3,1,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[52,3,"精灵小偷",3,3,2,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[53,3,"精灵小偷",3,3,3,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[54,3,"精灵小偷",3,3,4,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[55,3,"精灵小偷",3,3,5,2,4,4500,2400,1.5,8,3000,["box:3:1"],[500,9500],2],[56,4,"大波僵尸",3,1,1,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[57,4,"大波僵尸",3,1,2,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[58,4,"大波僵尸",3,1,3,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[59,4,"大波僵尸",3,1,4,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[60,4,"大波僵尸",3,1,5,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[61,4,"大波僵尸",3,2,1,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[62,4,"大波僵尸",3,2,2,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[63,4,"大波僵尸",3,2,3,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[64,4,"大波僵尸",3,2,4,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[65,4,"大波僵尸",3,2,5,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[66,4,"大波僵尸",3,3,1,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[67,4,"大波僵尸",3,3,2,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[68,4,"大波僵尸",3,3,3,1,12,1500,3300,1.5,16,3000,["gold:5"],[500,9500],1],[69,4,"大波僵尸",3,3,4,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[70,4,"大波僵尸",3,3,5,2,6,3000,3300,1.5,16,3000,["box:3:1"],[500,9500],2],[71,5,"Dio",3,1,1,2,8,4500,3600,2,32,3000,["gold:5"],[500,9500],2],[72,5,"Dio",3,1,2,3,12,3000,3600,2,32,3000,["gold:5"],[500,9500],3],[73,5,"Dio",3,1,3,1,24,1500,3600,2,32,3000,["gold:5"],[500,9500],1],[74,5,"Dio",3,1,4,3,12,3000,3600,2,32,3000,["gold:5"],[500,9500],3],[75,5,"Dio",3,1,5,2,8,4500,3600,2,32,3000,["gold:5"],[500,9500],2],[76,5,"Dio",3,2,1,3,12,3000,3900,2,32,3000,["gold:5"],[500,9500],3],[77,5,"Dio",3,2,2,1,24,1500,3900,2,32,3000,["gold:5"],[500,9500],1],[78,5,"Dio",3,2,3,2,8,4500,3900,2,32,3000,["gold:5"],[500,9500],2],[79,5,"Dio",3,2,4,1,24,1500,3900,2,32,3000,["gold:5"],[500,9500],1],[80,5,"Dio",3,2,5,3,12,3000,3900,2,32,3000,["gold:5"],[500,9500],3],[81,5,"Dio",3,3,1,1,24,1500,4200,2,32,3000,["gold:5"],[500,9500],1],[82,5,"Dio",3,3,2,3,12,3000,4200,2,32,3000,["gold:5"],[500,9500],3],[83,5,"Dio",3,3,3,2,8,4500,4200,2,32,3000,["gold:5"],[500,9500],2],[84,5,"Dio",3,3,4,3,12,3000,4200,2,32,3000,["gold:5"],[500,9500],3],[85,5,"Dio",3,3,5,1,24,1500,4200,2,32,3000,["gold:5"],[500,9500],1],[86,5,"Dio",3,4,1,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[87,5,"Dio",3,4,2,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[88,5,"Dio",3,4,3,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[89,5,"Dio",3,4,4,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[90,5,"Dio",3,4,5,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[91,5,"Dio",3,5,1,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[92,5,"Dio",3,5,2,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[93,5,"Dio",3,5,3,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[94,5,"Dio",3,5,4,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[95,5,"Dio",3,5,5,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[96,5,"Dio",3,6,1,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[97,5,"Dio",3,6,2,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[98,5,"Dio",3,6,3,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[99,5,"Dio",3,6,4,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[100,5,"Dio",3,6,5,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[101,5,"Dio",3,7,1,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[102,5,"Dio",3,7,2,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[103,5,"Dio",3,7,3,1,24,1500,5400,2,64,3000,["gold:5"],[500,9500],1],[104,5,"Dio",3,7,4,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[105,5,"Dio",3,7,5,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[106,5,"Dio",3,8,1,2,8,4500,5700,2,64,3000,["gold:5"],[500,9500],2],[107,5,"Dio",3,8,2,3,12,3000,5700,2,64,3000,["gold:5"],[500,9500],3],[108,5,"Dio",3,8,3,1,24,1500,5700,2,64,3000,["gold:5"],[500,9500],1],[109,5,"Dio",3,8,4,3,12,3000,5700,2,64,3000,["gold:5"],[500,9500],3],[110,5,"Dio",3,8,5,2,8,4500,5700,2,64,3000,["gold:5"],[500,9500],2],[111,5,"Dio",3,9,1,3,12,3000,6000,2,64,3000,["gold:5"],[500,9500],3],[112,5,"Dio",3,9,2,1,24,1500,6000,2,64,3000,["gold:5"],[500,9500],1],[113,5,"Dio",3,9,3,2,8,4500,6000,2,64,3000,["gold:5"],[500,9500],2],[114,5,"Dio",3,9,4,1,24,1500,6000,2,64,3000,["gold:5"],[500,9500],1],[115,5,"Dio",3,9,5,3,12,3000,6000,2,64,3000,["gold:5"],[500,9500],3],[116,5,"Dio",3,10,1,1,24,1500,6300,2,64,3000,["gold:5"],[500,9500],1],[117,5,"Dio",3,10,2,3,12,3000,6300,2,64,3000,["gold:5"],[500,9500],3],[118,5,"Dio",3,10,3,2,8,4500,6300,2,64,3000,["gold:5"],[500,9500],2],[119,5,"Dio",3,10,4,3,12,3000,6300,2,64,3000,["gold:5"],[500,9500],3],[120,5,"Dio",3,10,5,1,24,1500,6300,2,64,3000,["gold:5"],[500,9500],1],[121,5,"Dio",3,11,1,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[122,5,"Dio",3,11,2,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[123,5,"Dio",3,11,3,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[124,5,"Dio",3,11,4,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[125,5,"Dio",3,11,5,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[126,5,"Dio",3,12,1,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[127,5,"Dio",3,12,2,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[128,5,"Dio",3,12,3,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[129,5,"Dio",3,12,4,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[130,5,"Dio",3,12,5,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1]] \ No newline at end of file diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_teachport.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_teachport.json" new file mode 100644 index 0000000..b5bc669 --- /dev/null +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_teachport.json" @@ -0,0 +1 @@ +[[1,1,"史莱姆大王",1,1,1,0,0,0,200,1.5,2,3000,["0"],[0],0],[2,1,"史莱姆大王",1,1,2,0,0,0,200,1.5,2,3000,["0"],[0],0],[3,1,"史莱姆大王",1,1,3,3,10,2000,200,1.5,2,3000,["0"],[0],3],[4,1,"史莱姆大王",1,1,4,0,0,0,200,1.5,2,3000,["0"],[0],0],[5,1,"史莱姆大王",1,1,5,0,0,0,200,1.5,2,3000,["0"],[0],0],[6,2,"史莱姆大王",1,2,1,0,0,0,350,1.5,2,3000,["0"],[0],0],[7,2,"史莱姆大王",1,2,2,1,10,2000,5000,1.5,2,3000,["0"],[0],1],[8,2,"史莱姆大王",1,2,3,0,0,0,350,1.5,2,3000,["0"],[0],0],[9,2,"史莱姆大王",1,2,4,0,0,0,350,1.5,2,3000,["0"],[0],0],[10,2,"史莱姆大王",1,2,5,0,0,0,350,1.5,2,3000,["0"],[0],0]] \ No newline at end of file diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" index 193c90d..907b698 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" index b74b495..63502eb 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0" index 63f53d1..3fa3101 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" index d33edfd..1dd3c53 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2" index 97755fe..25a3e42 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3" index b2a4ced..d48200c 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level4" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level4" deleted file mode 100644 index 3f6c93d..0000000 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level4" +++ /dev/null Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" index 7352036..798628f 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS" index 5894721..471a219 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets" index 2ee7da1..5234381 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets.resS" new file mode 100644 index 0000000..9127fff --- /dev/null +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets.resS" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" index ab65285..0826a22 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets.resS" index 9127fff..7199d25 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets.resS" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets.resS" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets" index f53ea93..36b3e6b 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS" index 7199d25..1d405da 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.resource" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.resource" similarity index 100% rename from "GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.resource" rename to "GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.resource" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets" index c5775d3..0490fed 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS" index a6a43c5..52bd583 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets4.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets4.assets" deleted file mode 100644 index 29eb3c7..0000000 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets4.assets" +++ /dev/null Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets4.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets4.assets.resS" deleted file mode 100644 index fd8f206..0000000 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets4.assets.resS" +++ /dev/null Binary files differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 925791f..ddd2c5d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/TestTalkingData.unity guid: 415e09a546f94cf4b883227ff1be6086 - enabled: 1 -- Gitblit v1.9.1