Commit Graph

560 Commits (ccb0cd48382739df1d386b59be69563a97de45d8)

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
PC-202302260912\Administrator 795c3e52f0 心願抽卡修改提交 2023-06-13 18:46:34 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
wangzhenxing 9b40cb5314 [战斗]======被动327修改 2023-04-12 17:44:00 +08:00
wangzhenxing 6d3fe931d3 [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
yuanshuai 31f51cca80 神兵红点提交 2023-04-04 18:21:14 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +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
wangzhenxing 260db13451 超值基金,热榜红点提交 2023-01-16 14:37:14 +08:00
wangzhenxing 6a2b5b8b09 推荐阵容调整位置 加红点 2023-01-10 16:39:58 +08:00
wangzhenxing 286e8c0839 我是gm 红点提交 2022-12-30 15:08:22 +08:00
wangzhenxing 3acd9919ab 豪华补给红点提交 2022-12-29 17:45:27 +08:00
wangzhenxing 5a9de1f434 玲珑宝镜红点提交 2022-12-27 15:44:08 +08:00
yuanshuai 0965bf200d --奇珍宝阁相关红点屏蔽 2022-12-20 17:49:37 +08:00
yuanshuai 3371b86e57 妖晶和仙晶累充活动提交 2022-12-19 13:38:36 +08:00
wangzhenxing 2502a07a13 主城特惠商城入口红点修改 2022-12-15 17:56:12 +08:00
wangzhenxing 1e19300811 [bt]======gm修改器 2022-11-30 18:36:50 +08:00
wangzhenxing 5c49a471da [gm]====送10万充提交 2022-11-28 18:40:45 +08:00
wangzhenxing df423a0729 月卡显示修改 2022-11-24 10:37:40 +08:00
wangzhenxing bfd7967d52 抽卡红点修改 2022-11-23 14:33:39 +08:00
wangzhenxing 3c1e1c389d 添加名望特权红点 2022-11-08 18:33:09 +08:00
wangzhenxing ceeef789ed 探索特权修改提交 2022-11-08 13:45:52 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +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 efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
yuanshuai c2c05f391c 特权收益代码提交 2022-09-13 10:51:48 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing 19e5205496 [限时招募礼包]====红点提交 2022-08-18 18:01:14 +08:00
wangzhenxing bb9f877652 [显示招募]====添加珍奇宝阁 2022-08-17 17:45:12 +08:00
wangzhenxing e488e98680 [飘渺之旅]======红点修改提交 2022-07-25 15:37:56 +08:00
wangzhenxing b0dfb411b8 [数字游戏]======红点修改提交 2022-07-25 15:06:04 +08:00
yuanshuai cd0d9bad9e 添加八日登陆红点 2022-07-21 13:43:03 +08:00
wangzhenxing 47f407fad6 [跳转]======添加跳转108类型 2022-07-11 15:21:28 +08:00
wangzhenxing 812cfaabb6 [月卡]======月卡红点修改 2022-06-30 10:21:13 +08:00
yuanshuai 3b8922d9f7 Merge branch '0功能/周卡月卡' into china/dev 2022-06-10 11:24:15 +08:00
wangzhenxing ee3fecc198 [主题活动累充有礼]=====红点修改 2022-06-09 15:51:44 +08:00
yuanshuai 2d18090df7 周卡月卡脚本预设提交 2022-06-09 14:19:07 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
wangzhenxing 054c31caee [周卡]=====红点提交 2022-06-01 13:23:34 +08:00
yuanshuai d39933b48d 红点提交 2022-05-18 20:06:18 +08:00
yuanshuai 9e0e197a2b 商店代币页签红点修改 2022-04-28 17:12:25 +08:00
yuanshuai 4e70fc5113 限时活动红点修改 2022-04-28 14:26:35 +08:00
wangzhenxing 6606b6bc64 56级宝物显示在背包 2022-04-28 13:46:14 +08:00
yuanshuai bce1445a77 神印商店红点添加 2022-04-26 19:08:26 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
wangzhenxing e0263ea164 添加神印笔跳转 2022-04-25 13:43:46 +08:00