Commit Graph

622 Commits (bb967fb2b63f2b4adbe70a95463f2fa1b1082bc6)

Author SHA1 Message Date
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 ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
yuanshuai 2653838516 脚本修改 2023-04-07 13:48:56 +08:00
yuanshuai fc218b4002 神兵回炉代码提交 2023-04-07 10:29:10 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
yuanshuai a176bca619 神兵相关修改提交 2023-03-31 17:52:12 +08:00
wangzhenxing 10fee38b64 神兵提交 2023-03-29 10:48:35 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 6d55ae95d7 Revert "多队塔提交"
This reverts commit 4a411833a5.
2023-03-20 11:42:40 +08:00
wangzhenxing 4a411833a5 多队塔提交 2023-03-20 11:22:44 +08:00
yuanshuai 7bb73f1175 神将置换卡bug修改 2023-02-21 14:24:00 +08:00
wangzhenxing 76c81f44d4 法相增加属性计算修改 2023-02-20 14:46:37 +08:00
wangzhenxing d84f374bf2 法相修改提交 2023-02-19 20:08:48 +08:00
wangzhenxing 1f83739af1 法相升级升星提交 2023-02-18 22:21:24 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
wangzhenxing 27b390e8c2 Revert "法相协议提交"
This reverts commit cd865d4df5.
2023-02-16 17:53:13 +08:00
wangzhenxing cd865d4df5 法相协议提交 2023-02-16 17:03:02 +08:00
wangzhenxing c894b57bb7 登陆第一个请求添加日志 2023-02-13 14:54:48 +08:00
wangzhenxing 7109e86706 英雄热榜提交 2022-12-13 16:06:12 +08:00
wangzhenxing d6ada9958a gm购买提示修改 2022-11-10 13:45:03 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
wangzhenxing 2358e7b4f5 [bt]====名望特权修改 2022-10-21 18:11:03 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
yuanshuai f6e27c21d3 神应相关属性战斗力修改 2022-09-07 11:40:13 +08:00
yuanshuai d0d94401d4 魂宝灵宝分解 2022-09-07 10:14:05 +08:00
wangzhenxing ba6ee4065d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-09-06 14:22:42 +08:00
wangzhenxing 30ed15db3a [神印]======升品修改 2022-09-06 14:22:14 +08:00
yuanshuai 573ea577ce 建木神树修改提交 2022-09-06 10:16:57 +08:00
yuanshuai 08cf1d1ea8 添加重置 2022-09-02 13:15:24 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
yuanshuai d152c46668 变身卡升星bug修复 2022-08-30 16:31:11 +08:00
wangzhenxing 9c144af11c [森罗幻境]=====添加扫荡 2022-08-17 14:23:45 +08:00
wangzhenxing b33d6486d9 HTTP get 请求修改 2022-07-15 14:31:26 +08:00
wangzhenxing 2d5ae6b8b2 增加HTTP post请求 2022-07-15 14:20:47 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00
yuanshuai eca9a7d052 漏提交 2022-05-05 17:16:30 +08:00
yuanshuai 1e6d693209 山河设计图分页请求修改 2022-05-05 16:46:33 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +08:00
yuanshuai 750b243bb9 化身之力红点bug修改 2022-04-26 14:47:04 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
yuanshuai f8f14d06e9 挑战副本修改 2022-04-18 00:03:41 +08:00
yuanshuai bd3bed7e41 挑战副本脚本提交 2022-04-15 11:48:52 +08:00