Commit Graph

426 Commits (663fbca133fe0ba297ec3681188a114ebb99e62f)

Author SHA1 Message Date
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
wangzhenxing 7758ec6d8d 法宝自选箱,宝物添加时空选项 2023-04-21 10:50:09 +08:00
wangzhenxing 5999c18900 新英雄上阵修改提交 2023-04-18 15:34:22 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +08:00
yuanshuai 0d44032d25 灵脉修改 2023-02-20 15:06:47 +08:00
wangzhenxing ba747f657a 神印升品空白修改 2023-01-24 20:29:23 +08:00
wangzhenxing c1e82cdeac 神将召唤自选箱修改 2022-12-27 14:32:01 +08:00
wangzhenxing 7109e86706 英雄热榜提交 2022-12-13 16:06:12 +08:00
wangzhenxing aea73aecec 【山河设计图】====购买玉衡龙魂丹消耗修改 2022-11-07 16:19:03 +08:00
wangzhenxing 8ecb6ee081 七界特权描述修改 2022-11-07 15:06:33 +08:00
wangzhenxing 422efbe338 青龙秘宝价格修改 2022-11-04 14:43:35 +08:00
wangzhenxing f3d4eed21c [gm]=======名望特权修改 2022-10-25 10:23:48 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
wangzhenxing a32c76c9a0 [神罗环境]=======无法重复扫荡 2022-08-18 16:32:06 +08:00
wangzhenxing d38d35cadb [法宝]=====归元提示修改 2022-08-10 16:44:44 +08:00
wangzhenxing 958c4286d1 [洞府摘星阁]=====显示修改 2022-08-09 13:42:59 +08:00
wangzhenxing bd1ad039d9 [洞府摘星阁]======摘星阁消耗修改 2022-08-08 16:13:14 +08:00
wangzhenxing 46f9a08c22 【抽卡】=======自选箱描述修改 2022-07-12 19:04:18 +08:00
yuanshuai 7f65810d70 宝箱添加点击详情 2022-07-06 11:40:35 +08:00
wangzhenxing bb3f825aa9 【青龙秘宝】======奖励添加空判断 2022-07-04 18:43:22 +08:00
wangzhenxing 18660a1954 【青龙秘宝】=====添加空判断 2022-07-04 18:08:07 +08:00
wangzhenxing cc883eadff 【青龙秘宝】========购买秘宝等级报错修改 2022-07-04 17:55:34 +08:00
wangzhenxing d5be125722 【抽卡】=======抽卡宝箱描述修改 2022-06-08 18:14:25 +08:00
wangzhenxing 35fe308aaa [抽卡]======仙缘箱开始展示修改 2022-06-08 17:15:25 +08:00
wangzhenxing 9eb6f8fb4e [英雄信息]=====背景修改 2022-06-06 16:14:29 +08:00
wangzhenxing a2cab243fc 【专属升星】======选择英雄界面报错修改 2022-05-26 11:14:13 +08:00
wangzhenxing e509483e41 [寻仙招募]=====预设修改 2022-05-23 15:30:58 +08:00
wangzhenxing e7df09c284 [寻仙招募]======修改提交 2022-05-23 11:29:10 +08:00
wangzhenxing 685d475f2e 抽卡宝箱描述修改 2022-05-09 18:04:06 +08:00
wangzhenxing 97d96d07c0 仙缘汇聚箱描述修改 2022-05-09 14:02:31 +08:00
yuanshuai 44804a9a4d 漏提交 2022-04-26 18:52:19 +08:00
wangzhenxing aad7541dbd 挑战副本不显示倒计时 2022-04-24 21:31:49 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing 5afe0f400b 洞府装备加成显示修改 2022-04-07 11:45:51 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
wangzhenxing 9a2f342ef7 【功能】======寻仙招募优化 2022-04-01 17:10:37 +08:00
wangzhenxing 88d80be02b 【bug】============神系转换职业修改 2022-03-31 17:25:43 +08:00
wangzhenxing 764f61cfb2 [bug]=====飞升界面英雄临时数据修改 2022-03-31 14:29:25 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
gaoxin 0ce89251f8 【选择神将】报错修复 2022-02-24 02:56:42 +08:00
gaoxin c2b4647418 【限时Up】加入神将版本判断 2022-02-11 16:22:44 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
ZhangBiao 54aeaa2ea8 【寻仙招募】提交 2022-01-18 12:09:43 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
jiaoyangna a4cbd77a99 许愿神将修改提交 2022-01-17 11:23:22 +08:00
jiaoyangna 4abe2d4203 Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43.
2022-01-17 11:18:55 +08:00
wangzhenxing a7ad2ee1f6 Merge branch 'china/dev' into china/飞升 2022-01-17 10:50:14 +08:00