From cfecffaf7dea58d74867de14812cbcf45d310837 Mon Sep 17 00:00:00 2001 From: tlk <werasdrsd@qq,com> Date: 星期四, 16 十月 2025 16:31:51 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout --- Config/NPCLineup.txt | 6 +++--- Config/Effect.txt | 26 +++++++++++++------------- Config/FuncConfig.txt | 2 +- Config/AppointItem.txt | 3 +++ Config/Store.txt | 16 ++++++++++++++-- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/Config/AppointItem.txt b/Config/AppointItem.txt index 18a8256..b50ac62 100644 --- a/Config/AppointItem.txt +++ b/Config/AppointItem.txt @@ -19,3 +19,6 @@ 112 0 2 6|7|8 7|1|60 113 0 3 6|7|8 35|7|270 114 0 4 6|7|8 24|5|190 +115 0 3 6|7|8 11|2|80 +116 0 2 6|7|8 8|1|70 +117 0 1 6|7|8 11|2|90 diff --git a/Config/Effect.txt b/Config/Effect.txt index 41efaa1..1f013b9 100644 --- a/Config/Effect.txt +++ b/Config/Effect.txt @@ -69,24 +69,24 @@ 10003 BattleSpine\610001_tongyong 1 tex-effect-liuxie-02_SkeletonData hit 0 1 1 0|10 0.5 10004 BattleSpine\610001_tongyong 1 tex_eff_zhuoshao_SkeletonData hit 0 1 1 5|-45 0.5 10005 BattleSpine\610001_tongyong 1 tex_eff_zhuoshaouanhuo_SkeletonData hit 0 1 1 5|100 0.5 -10006 BattleSpine\610001_tongyong 1 tex-effect-touming_zidan_SkeletonData hit 1 1 1 0.5 +10006 BattleSpine\610001_tongyong 1 tex-effect-touming_zidan_SkeletonData hit 0 1 1 0.5 10007 BattleSpine\610001_tongyong 1 tex-effect-zengyi-lan-01_SkeletonData hit 1 3 1 0.7 10008 BattleSpine\610001_tongyong 1 tex-effect-jianyi-hong-01_SkeletonData hit 1 3 1 0.7 10009 BattleSpine\610001_tongyong 1 tex-effect-xuanyun-01_SkeletonData hit 1 1 1 0|70 0.5 10010 BattleSpine\610001_tongyong 1 tex-effect-zhiliao-01_SkeletonData hit 1 3 1 0.5 100001 BattleSpine\510006_Wei_Caoyi 1 angerskill_up_SkeletonData 1 3 1 0.5 -100002 BattleSpine\510006_Wei_Caoyi 1 attack_zidan_SkeletonData 1 1 1 0.4 +100002 BattleSpine\510006_Wei_Caoyi 1 attack_zidan_SkeletonData 0 1 1 0.4 100003 BattleSpine\510006_Wei_Caoyi 1 attack_eft_SkeletonData 1 3 1 0.4 100004 BattleSpine\510006_Wei_Caoyi 1 angerskill_eft_SkeletonData 1 3 1 0.5 100005 BattleSpine\510006_Wei_Caoyi 1 angerskill_eft_down_SkeletonData 1 3 1 0.5 100006 BattleSpine\510006_Wei_Caoyi 1 attack_up_SkeletonData 1 1 1 0.5 100011 BattleSpine\510001_Wei_Caoying 1 angerskill_up_SkeletonData 1 3 1 0|-30 0.5 -100012 BattleSpine\510001_Wei_Caoying 1 attack_zidan_SkeletonData 1 1 1 0.27 +100012 BattleSpine\510001_Wei_Caoying 1 attack_zidan_SkeletonData 0 1 1 0.27 100013 BattleSpine\510001_Wei_Caoying 1 angerskill_eft_SkeletonData 1 3 1 0.3 100014 BattleSpine\510001_Wei_Caoying 1 attack_up_SkeletonData 1 3 1 0|-37 0.5 100015 BattleSpine\510001_Wei_Caoying 1 attack_eft_SkeletonData 1 3 1 0.25 100016 BattleSpine\510002_Wei_Yuejin 1 attack_up_SkeletonData 1 3 1 0 -240|-30 0.5 -100017 BattleSpine\510001_Wei_Caoying 1 attack_zidan_SkeletonData 1 1 1 0.5 +100017 BattleSpine\510001_Wei_Caoying 1 attack_zidan_SkeletonData 0 1 1 0.5 100021 BattleSpine\510002_Wei_Yuejin 1 angerskill_up_SkeletonData 1 3 1 0.1 10|-10 0.5 100022 BattleSpine\510002_Wei_Yuejin 1 attack_up_SkeletonData 1 3 1 0 -50|-10 0.35 100031 BattleSpine\510003_Wei_Pangde 1 angerskill_up2_SkeletonData 1 3 1 2 40|-30 0.5 @@ -107,7 +107,7 @@ 100063 BattleSpine\510006_Wei_Caoyi 1 attack_eft_SkeletonData 1 3 1 0.4 100064 BattleSpine\510006_Wei_Caoyi 1 angerskill_eft_SkeletonData 1 3 1 0.5 100065 BattleSpine\510006_Wei_Caoyi 1 angerskill_eft_down_SkeletonData 1 3 0 0.5 -100066 BattleSpine\510006_Wei_Caoyi 1 attack_zidan_SkeletonData 1 1 1 0.4 +100066 BattleSpine\510006_Wei_Caoyi 1 attack_zidan_SkeletonData 0 1 1 0.4 100071 BattleSpine\510007_Wei_Lidian 1 angerskill_up_SkeletonData 1 3 1 50|0 0.4 100072 BattleSpine\510007_Wei_Lidian 1 angerskill_eft_SkeletonData 1 3 1 1.6 120|0 0.5 100073 BattleSpine\510007_Wei_Lidian 1 attack_eft_SkeletonData 1 3 1 -370|-40 0.5 @@ -115,8 +115,8 @@ 100082 BattleSpine\510008_Wei_Caiwenji 1 angerskill_since_up_SkeletonData 1 3 1 50|0 0.4 100083 BattleSpine\510008_Wei_Caiwenji 1 angerskill_up_SkeletonData 1 3 1 50|0 0.4 100084 BattleSpine\510008_Wei_Caiwenji 1 attack_hit_SkeletonData 1 3 1 0.22 -100085 BattleSpine\510008_Wei_Caiwenji 1 attack_eft_SkeletonData 1 1 1 0.3 -100086 BattleSpine\520004_Shu_Zhugeguo 1 attack_zidan_SkeletonData 1 3 1 0|20 0.35 +100085 BattleSpine\510008_Wei_Caiwenji 1 attack_eft_SkeletonData 1 3 1 1 0.3 +100086 BattleSpine\520004_Shu_Zhugeguo 1 attack_zidan_SkeletonData 0 1 0|20 0.35 100091 BattleSpine\510009_Wei_Jiaxu 1 attack_eft_SkeletonData 1 3 1 1 290|0 0.5 100092 BattleSpine\510009_Wei_Jiaxu 1 angerskill_up_SkeletonData 1 3 1 0.5 100093 BattleSpine\510009_Wei_Jiaxu 1 angerskill_eft_SkeletonData 1 3 1 0.4 450|0 0.4 @@ -130,7 +130,7 @@ 100112 BattleSpine\510011_Wei_Wangyuanji 1 skill0_eft_up_SkeletonData 1 3 1 0.06 300|-50 0.6 100113 BattleSpine\510011_Wei_Wangyuanji 1 skill1_eft_down_SkeletonData 1 3 0 0|-40 0.25 100114 BattleSpine\510011_Wei_Wangyuanji 1 skill1_eft_up_SkeletonData 1 3 1 0|-40 0.3 -100121 BattleSpine\510012_Wei_Simayi 1 10004_fly-pg_SkeletonData 1 2 1 0.5 +100121 BattleSpine\510012_Wei_Simayi 1 10004_fly-pg_SkeletonData 0 1 0.5 100122 BattleSpine\510012_Wei_Simayi 1 10004_hit-pg_SkeletonData 1 2 1 0.6 100123 BattleSpine\510012_Wei_Simayi 1 10004_effects-pg_SkeletonData 1 2 1 0.5 100124 BattleSpine\510012_Wei_Simayi 1 10004_effects-swbz-qn_SkeletonData 1 3 1 0.5 @@ -140,7 +140,7 @@ 100131 BattleSpine\510013_Wei_Zhenfu 1 angerskill_up_down_SkeletonData 1 3 1 0.5 100132 BattleSpine\510013_Wei_Zhenfu 1 angerskill_up_SkeletonData 1 3 1 0.5 30|-50 0.3 100133 BattleSpine\510013_Wei_Zhenfu 1 attack_eft_SkeletonData 1 3 1 0.5 -100134 BattleSpine\510013_Wei_Zhenfu 1 attack_zidan_SkeletonData 1 3 1 0.4 +100134 BattleSpine\510013_Wei_Zhenfu 1 attack_zidan_SkeletonData 0 1 0.4 100135 BattleSpine\510013_Wei_Zhenfu 1 attack_up_SkeletonData 1 3 1 0.5 100136 BattleSpine\510013_Wei_Zhenfu 1 angerskill_up_SkeletonData_SkeletonData 1 2.5 1 0|-35 0.5 100141 BattleSpine\510014_Wei_Caocao 1 angerskill_eft_down_SkeletonData 1 3 0 300|-15 0.5 @@ -158,7 +158,7 @@ 200013 BattleSpine\520001_Shu_Mizhu 1 angerskill_eft_up_SkeletonData 1 3 1 0|-65 0.4 200014 BattleSpine\520001_Shu_Mizhu 1 angerskill_up_SkeletonData 1 3 1 0|-65 0.4 200015 BattleSpine\520001_Shu_Mizhu 1 attack_eft_SkeletonData 1 3 1 0.5 -200016 BattleSpine\520001_Shu_Mizhu 1 attack_zidan_SkeletonData 1 3 1 0.35 +200016 BattleSpine\520001_Shu_Mizhu 1 attack_zidan_SkeletonData 0 1 0.35 200021 BattleSpine\520002_Shu_Baosanniang 1 angerskill_eft_SkeletonData 1 3 1 0.5 200022 BattleSpine\520002_Shu_Baosanniang 1 angerskill_up_SkeletonData 1 3 1 0.4 -40|-20 0.4 200023 BattleSpine\520002_Shu_Baosanniang 1 attack_eft_SkeletonData 1 3 1 0.5 @@ -171,7 +171,7 @@ 200041 BattleSpine\520004_Shu_Zhugeguo 1 angerskill_down_SkeletonData 1 3 0 0|-20 0.35 200042 BattleSpine\520004_Shu_Zhugeguo 1 angerskill_up_SkeletonData 1 3 1 1.5 0|-20 0.55 200043 BattleSpine\520004_Shu_Zhugeguo 1 attack_eft_SkeletonData 1 3 1 0.5 -200044 BattleSpine\520004_Shu_Zhugeguo 1 attack_zidan_SkeletonData 1 3 1 0|20 0.4 +200044 BattleSpine\520004_Shu_Zhugeguo 1 attack_zidan_SkeletonData 0 1 0|20 0.4 200051 BattleSpine\520005_Shu_Guanxing 1 angerskill_up_SkeletonData 1 3 1 0.7 10|-20 0.35 200052 BattleSpine\520005_Shu_Guanxing 1 attack_eft_down_SkeletonData 1 3 1 0.5 200053 BattleSpine\520005_Shu_Guanxing 1 attack_up_SkeletonData 1 3 1 0 0|-20 0.45 @@ -183,7 +183,7 @@ 200065 BattleSpine\520006_Shu_Ganfuren 1 attack_eft_SkeletonData 1 3 1 0.3 200066 BattleSpine\520006_Shu_Ganfuren 1 attack_up_SkeletonData 1 3 1 1 0.4 200067 BattleSpine\520006_Shu_Ganfuren 1 attack_zhiliao_SkeletonData 1 3 1 0|-50 0.5 -200068 BattleSpine\520006_Shu_Ganfuren 1 attack_zidan_SkeletonData 1 3 1 0.35 +200068 BattleSpine\520006_Shu_Ganfuren 1 attack_zidan_SkeletonData 0 1 0.35 200071 BattleSpine\520007_Shu_Zhangxingcai 1 1 3 1 0.5 200072 BattleSpine\520007_Shu_Zhangxingcai 1 1 3 1 0.5 200073 BattleSpine\520007_Shu_Zhangxingcai 1 1 3 1 0.5 @@ -201,7 +201,7 @@ 200092 BattleSpine\520009_Shu_Pangtong 1 angerskill_up_SkeletonData 1 3 1 0.17 -41|26 0.35 200093 BattleSpine\520009_Shu_Pangtong 1 attack_up_SkeletonData 1 3 1 0.13 -27|43 0.3 200094 BattleSpine\520009_Shu_Pangtong 1 attack_eft_SkeletonData 1 3 1 0.3 -200095 BattleSpine\520004_Shu_Zhugeguo 1 attack_zidan_SkeletonData 1 3 1 50|100 0.3 +200095 BattleSpine\520004_Shu_Zhugeguo 1 attack_zidan_SkeletonData 0 1 50|100 0.3 200096 BattleSpine\520009_Shu_Pangtong 1 1 3 1 0.5 200097 BattleSpine\520009_Shu_Pangtong 1 1 3 1 0.5 200101 BattleSpine\520010_Shu_Zhaoyun 1 1 3 1 0.5 diff --git a/Config/FuncConfig.txt b/Config/FuncConfig.txt index 3f87601..a46c8a0 100644 --- a/Config/FuncConfig.txt +++ b/Config/FuncConfig.txt @@ -52,4 +52,4 @@ GoldRushRefresh 1 42 [10,20,30,40,50] 30 HeroCall 3 HeroRedpoint [7,8,9] -PopWin 0.5 +PopWin 1.5 diff --git a/Config/NPCLineup.txt b/Config/NPCLineup.txt index 69a4912..05f30b9 100644 --- a/Config/NPCLineup.txt +++ b/Config/NPCLineup.txt @@ -3,8 +3,8 @@ 闃靛ID 1鍙蜂綅NPCID 2鍙蜂綅NPCID 3鍙蜂綅NPCID 4鍙蜂綅NPCID 5鍙蜂綅NPCID 6鍙蜂綅NPCID 7鍙蜂綅NPCID 鏈樀瀹圭殑BossID boss闄勫姞鎶�鑳藉簱 闅忔満闄勫姞鎶�鑳芥暟 1010101 10101011 0 1001 0 1010102 10101021 10101022 0 1002 0 -1010103 10101031 10101031 10101032 0 1003 0 -1010104 10101042 10101042 10101043 10101043 0 1004 0 +1010103 10101031 10101032 10101032 0 1003 0 +1010104 10101042 10101042 10101043 10101041 0 1004 0 1010105 10101051 10101052 10101053 0 1005 0 1010106 10101061 10101062 10101063 0 1006 0 1010107 10101071 10101072 10101073 0 1007 0 @@ -13,7 +13,7 @@ 1010201 10102011 10102011 10102012 10102012 10102012 0 1010 0 1010202 10102021 10102022 10102023 0 1011 0 1010203 10102033 10102031 10102032 0 1012 0 -1010204 10102041 10102042 10102043 10102044 0 1013 0 +1010204 10102041 10102042 10102043 10102044 0 1013 0 1010205 10102051 10102052 10102053 0 1014 0 1010206 10102061 10102062 10102063 10102064 0 1015 0 1010207 10102071 10102072 10102074 10102073 0 1016 0 diff --git a/Config/Store.txt b/Config/Store.txt index e3cba1a..82096e7 100644 --- a/Config/Store.txt +++ b/Config/Store.txt @@ -1,5 +1,17 @@ int int int[] int int int int string int string int int[] int int int[] int int int int string int int int ID ShopType SecondType ShopSort ItemID ItemCnt IsBind ItemListEx MainItemID JobItem RefreshType VIPLV LV LVSee GoumaiNumber MoneyType MoneyNumber MoneyOriginal LimitValue SalesStatus TheOnlyShop RemindSuccess IsHideSellOut 鏍囪瘑 鍟嗗簵绫诲瀷 浜岀骇鏍囩 鍟嗗搧鎺掑簭 鐗╁搧ID 鐗╁搧鏁伴噺 鏄惁缁戝畾 闄勫姞鐗╁搧鍒楄〃 鏍囩殑鐗╁搧ID 鑱屼笟鏇挎崲鐗╁搧缁� 鍒锋柊绫诲瀷 VIP绛夌骇闄愬埗 鍙喘涔板晢鍝佺殑鐜╁绛夌骇锛堜笉褰卞搷鍟嗗搧鏄剧ず锛� 鍙樉绀哄晢鍝佺殑鐜╁绛夌骇 闄愯喘鏁伴噺 璐拱璐у竵绫诲瀷 璐у竵鏁伴噺 鍘熶环 闄愬埗鏉′欢 閿�鍞姸鎬� 鍞竴鍟嗗搧 鏄惁鎻愮ず璐拱鎴愬姛 鍞絼鐗╁搧鏄惁闅愯棌 -1 5 1 1 4105 1 0 [] 0 0 0 0 0 1 2 0 0 0 MF 1 1 1 -2 5 1 2 46 1 0 [] 0 0 0 0 0 1 2 5000 0 0 shopth 1 1 1 +1 1 1 1 3 25 0 [] 0 1 0 0 0 1 1 0 0 0 +2 1 1 2 4 1 0 [] 0 1 0 0 0 1 1 20 0 0 +3 1 1 3 2 10000 0 [] 0 0 0 0 0 0 1 100 0 0 +4 1 1 4 2 22000 0 [] 0 0 0 0 0 0 1 200 0 0 +5 1 1 5 2 45000 0 [] 0 0 0 0 0 0 1 400 0 0 +6 1 1 6 5 10 0 [] 0 1 0 0 0 1 1 2240 2800 0 +7 1 1 7 30 10 0 [] 0 1 0 0 0 1 1 1500 2000 0 +8 1 1 8 13 1 0 [] 0 1 0 0 0 2 1 240 0 0 +9 1 1 9 6 1 0 [] 0 1 0 0 0 10 1 100 0 0 +10 1 1 10 8 10 0 [] 0 1 0 0 0 100 1 100 0 0 +11 1 1 11 5 1 0 [] 0 0 0 0 0 0 1 280 0 0 +12 1 1 12 30 1 0 [] 0 0 0 0 0 0 1 200 0 0 +13 1 1 13 7 200 0 [] 0 0 0 0 0 0 1 100 0 0 +14 1 1 14 30 1 0 [] 0 0 0 0 0 0 1 500 0 0 -- Gitblit v1.8.0