Commit Graph

509 Commits (880c77888ab4dc21fb65e981c19303792cd323db)

Author SHA1 Message Date
ZhangBiao e40364082c Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:21:27 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
ZhangBiao f7f0d4099f 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00
ZhangBiao 8d245aab44 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
ZhangBiao 3262a6203c 【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7)
2020-12-21 14:19:41 +08:00
jiaoyangna 22785d4675 [天相几人]图片提交 2020-12-18 11:23:00 +08:00
jiaoyangna 9f01de23ea [主题活动] 2020-12-18 11:22:54 +08:00
ZhangBiao 4da5b2ac46 【易经宝库】 2020-12-12 17:53:34 +08:00
zhangqiang 475badacc1 博闻强识图片修改 2020-12-12 17:21:28 +08:00
jiaoyangna 0a1e1666f7 【博文多识】 2020-12-12 17:21:13 +08:00
ZhangBiao 9b58c897bf 【易经宝库】最中间的未开启 拿到大奖报错修改 2020-12-09 18:11:58 +08:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
ZhangBiao b2e53f8ae5 【新将来袭】战斗血条 2020-12-03 15:11:24 +08:00
ZhangBiao 86d190572a 【神将来袭】加战斗了 2020-12-02 17:14:52 +08:00
ZhangBiao ecb948a613 【神将来袭】真·差战斗 和为小游戏转盘增加log 2020-12-02 15:42:38 +08:00
ZhangBiao 2f07beaa08 【新将来袭】差战斗了 2020-12-02 09:51:17 +08:00
ZhangBiao 2d51e11e10 【神将来袭】代码完善 2020-12-01 15:52:34 +08:00
ZhangBiao 1222f1df0c 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
jiaoyangna 1299b62feb 灵兽宝阁位置名称修改 2020-11-19 17:22:10 +08:00
jiaoyangna d8f31bab35 主题活动修改提交 2020-11-19 14:26:57 +08:00
jiaoyangna e09872eb7f 限时招募修改提交 2020-11-19 10:35:21 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
ZhangBiao 69d818118c 【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复 2020-11-17 10:56:21 +08:00
ZhangBiao f384e25ad6 【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19)
2020-11-16 17:51:25 +08:00
ZhangBiao 4a0a702fec 【灵兽宝阁】凤凰无限飞bug缓解 2020-11-13 18:58:35 +08:00
ZhangBiao 46eeceb79d 【主题活动】bug修复 2020-11-13 18:00:56 +08:00
ZhangBiao ee04d93830 【灵兽宝阁】增加结束时间 2020-11-13 17:07:32 +08:00
ZhangBiao 933f2d4768 【灵兽宝阁】增加假战斗 2020-11-13 16:25:42 +08:00
ZhangBiao e4f48eb668 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 16:10:34 +08:00
ZhangBiao d739896793 【灵兽宝阁】倒计时显示刷新问题修复 2020-11-13 16:10:26 +08:00
jiaoyangna d4f79a0abb 限时招募提交 2020-11-13 15:50:42 +08:00
jiaoyangna 44a1d94860 神医天降修改 2020-11-13 15:47:04 +08:00
ZhangBiao 8a5d51e2a3 【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
2020-11-13 12:12:44 +08:00
ZhangBiao 2563c6bdd6 【灵兽宝阁】货币显示修复 2020-11-12 18:17:56 +08:00
ZhangBiao 5f596eef04 【灵兽宝阁】bug修复,增加等级限制 2020-11-12 17:53:49 +08:00
ZhangBiao 2c143deea9 Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-11-12 17:21:42 +08:00
ZhangBiao a5c36cf58a 【灵兽宝阁】未开启更换灵兽版本 2020-11-12 17:11:18 +08:00
jiaoyangna 7fc14ec822 [主题活动] 修改提交 2020-11-12 16:07:19 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
jiaoyangna 45c088e6b7 [灵兽特惠] 提交 2020-11-12 11:37:12 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
ZhangBiao ebe03eff48 【易经宝库】漏题 2020-11-10 16:43:24 +08:00
ZhangBiao ec9458aac7 【易经宝库】抽取灵兽报错修复 2020-11-10 16:25:42 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
ZhangBiao 46b8e52524 【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
2020-11-09 16:02:34 +08:00
ZhangBiao dca4f2511a Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-09 15:29:42 +08:00
ZhangBiao e6eb5d7673 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:28:24 +08:00
DESKTOP-98AVA47\Administrator 4be2045801 添加容错 --by 焦杨钠 2020-11-13 07:12:51 +08:00
ZhangBiao c4745e8c7c 【易经宝库】最终奖励选择bug修复 2020-11-09 13:47:37 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
jiaoyangna 6cb1610d31 神医天降修改 2020-11-07 16:56:53 +08:00
jiaoyangna 04fac7f216 魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗 2020-11-07 15:39:01 +08:00
jiaoyangna 0a772f466b 皮肤提交 2020-11-06 20:36:38 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
zhangqiang ac64980843 【易经宝库】 特效层级调整 2020-11-06 16:49:12 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
ZhangBiao 36759d8044 【易经宝库】增加稿子动效 2020-11-06 16:06:08 +08:00
ZhangBiao b98490f233 【易经宝库】差一个稿子的动效 2020-11-06 15:11:19 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
ZhangBiao 809c6daa01 【易经宝库】数据调试 2020-11-04 10:53:02 +08:00
ZhangBiao 5d40b102dc 【易经宝库】添加type 拼数据 2020-11-03 19:01:47 +08:00
ZhangBiao f79499faea 【易经宝库】开始获取活动数据 2020-11-03 09:58:37 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
zhangqiang c4a9cb99cf 【主题活动】commit 2020-10-30 10:08:54 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
ZhangBiao acd3f336e9 【设计大典】特效添加 2020-10-27 16:15:34 +08:00
jiaoyangna 5d3d65871a [主题活动-社稷大典]商店立绘重叠提交 2020-10-26 18:44:57 +08:00
ZhangBiao 6149e88620 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 17:04:28 +08:00
ZhangBiao c2612e2ca8 【社稷大典】捐献后 左上角 按钮状态切换修复 2020-10-26 17:04:07 +08:00
JieLing 0b8abaeabf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:51:53 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
ZhangBiao 5a20d41b77 【社稷大典】左上公会排行空白修改 2020-10-26 16:49:47 +08:00
ZhangBiao 0340b7d468 【社稷大典】打开社稷大典界面 时被提出公会 检测 2020-10-26 16:37:56 +08:00
ZhangBiao b2c841e572 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:11:11 +08:00
ZhangBiao 709dc1a5bd 【社稷大典】时间弹跳修复,物品边框颜色修改 2020-10-26 16:10:58 +08:00
jiaoyangna ce5db82250 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:05:59 +08:00
jiaoyangna b1d1aadec7 伏虎罗汉 修改 2020-09-17 12:37:43 +08:00
jiaoyangna 2df6f4076e [变幻莫测] 资源提交 2020-09-17 12:37:02 +08:00
jiaoyangna 2e4e34ef8d 灵兽宝阁 2020-09-17 12:36:43 +08:00
zhangqiang 6a0a52997c 变幻莫测 提交 2020-09-17 12:35:45 +08:00
jiaoyangna 0ba1161933 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-08-25 13:34:25 +08:00
ZhangBiao d30209f844 【社稷大典】捐献品价值修改 2020-10-26 12:35:29 +08:00
ZhangBiao 469235ff74 【社稷大典】捐献品3 点击加号跳转 2020-10-26 12:27:56 +08:00
ZhangBiao e6610518ce 【社稷大典】长按贡献数量不够无法捐赠bug修复 2020-10-26 12:23:04 +08:00
jiaoyangna 6d79dcab9a 活动修改提交 2020-10-29 09:50:47 +08:00
jiaoyangna 9763762e88 回滚提交 2020-10-24 19:31:41 +08:00
jiaoyangna 565ed0cc34 累计充值修改提交 2020-10-24 19:26:43 +08:00
jiaoyangna 0f5faff70f 累计充值修改提交 2020-10-24 19:26:37 +08:00
jiaoyangna 37ae683bf1 主题活动修改 2020-10-24 19:26:30 +08:00
jiaoyangna 43702ee6ca 累计充值修改 2020-10-24 19:25:52 +08:00
jiaoyangna 8db39458ca [累计充值修改提交] 2020-10-24 19:25:08 +08:00
jiaoyangna 0901d837be 限时召唤修改提交 2020-10-24 19:23:16 +08:00
jiaoyangna c134dabe49 [累计充值]提交 2020-10-24 19:19:03 +08:00
ZhangBiao 0bf6e05add 【社稷大典】提交6 2020-10-24 18:58:07 +08:00
ZhangBiao 01cbb3fba0 【社稷大典】提交5 2020-10-24 18:49:32 +08:00
ZhangBiao a62dc62ead 【社稷大典】提交 2020-10-24 18:20:43 +08:00
jiaoyangna 06dcc9f41c 勇往直前 提交 2020-10-21 14:13:07 +08:00
ZhangBiao 0dbf805ef8 限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d)
2020-10-23 17:38:45 +08:00
ZhangBiao 3b3a41c432 主题活动,势不可挡 霸哥修改
(cherry picked from commit dcf74880bc)
2020-10-23 17:38:33 +08:00
jiaoyangna d340795646 主题活动修改 提交 2020-10-10 17:59:30 +08:00
jiaoyangna 9706c45942 主题活动修改 2020-10-10 16:15:27 +08:00
jiaoyangna d51468cdca 势不可挡页签修改提交 2020-10-10 16:14:33 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna 97bb590c24 主题活动修改 2020-10-21 23:18:39 +08:00
jiaoyangna 2b6705f176 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 17:13:44 +08:00
jiaoyangna e84efa0961 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:05 +08:00
jiaoyangna 0b0776c220 【丹心碧血】限时兑换活动界面黑屏 2020-10-15 16:00:58 +08:00
jiaoyangna 0d99260d1a 【丹心碧血】限时召唤,up卡显示不正确 2020-10-10 13:39:50 +08:00
jiaoyangna d249eb412f 丹心碧血提交 2020-10-15 14:05:56 +08:00
jiaoyangna 8a43d1c9da 主题活动修改 2020-10-15 14:05:41 +08:00
jiaoyangna 7c38428100 丹心碧血图片提交 2020-10-15 14:04:45 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
JieLing 443a157006 【破阵诛仙】点金达人任务,跳转点金,不计数,修复乾坤宝盒快速切换报错的问题 2020-09-22 18:13:49 +08:00
JieLing f58f067fe5 Revert "【破阵诛仙】点金达人任务,跳转点金,不计数"
This reverts commit c5ffb7cb23.
2020-09-22 18:01:41 +08:00
jiaoyangna c5ffb7cb23 【破阵诛仙】点金达人任务,跳转点金,不计数 2020-09-22 17:36:43 +08:00
gaoxin 701db5bb17 充值接口修改,sdk和本地走同一套接口 2020-09-09 20:13:23 +08:00
zhangqiang 1908ce2ee8 破阵诛仙 2020-09-02 14:07:57 +08:00
jiaoyangna ff4d3e35c1 pozhenzhuxian redpoint update 2020-08-27 19:52:05 +08:00
gaoxin 82606d8fbe 每日周月礼包根据后端数据判断显隐 2020-08-27 18:35:32 +08:00
jiaoyangna 6aaa749852 activitydetail effect commit 2020-08-27 18:24:05 +08:00
ZhangBiao 8dd4feeead 乾坤宝囊特效增加 2020-08-26 17:56:59 +08:00
JieLing b1774c3853 累充界面金额转换为美元显示 2020-08-25 21:21:34 +08:00
JieLing 934b78e022 珍奇宝阁排序修改,198礼包放到最前面 2020-08-25 20:39:03 +08:00
JieLing 745150e59a 修复破阵诛仙界面销毁后,再次打开报错,显示异常的问题 2020-08-25 19:48:14 +08:00
JieLing 5a89f52577 充值商品价格改为按配置显示 2020-08-25 17:59:34 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao 6f6758bf14 元—>$的替换 2020-08-25 13:57:21 +08:00
jiaoyangna 1b445399e0 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-08-25 12:34:19 +08:00
jiaoyangna 6687d0425f 累计充值活动时间修改 2020-08-25 12:31:43 +08:00
JieLing c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +08:00
wangzhenxing c38fdf9784 珍奇宝阁排序修改 2020-08-24 18:29:18 +09:00
gaoxin d17c99956d 修复破阵诛仙-累计充值奖励不显示的问题 2020-08-22 20:50:45 +08:00
jiaoyangna 04bf990060 qinglong tijiao 2020-08-22 17:36:57 +08:00
ZhangBiao 7f0d404e5d 添加一键购买、礼包界面计时器销毁 2020-08-22 10:09:30 +08:00
ZhangBiao 1a826a3f3e 累计充值 2020-08-21 20:11:24 +08:00
ZhangBiao 52dda5ff47 青龙入口 破阵长度 2020-08-21 19:03:41 +08:00
ZhangBiao bbe2c8c1f3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-21 18:30:50 +08:00
jiaoyangna 8c17479fd6 破阵诛仙活动 调整 2020-08-28 17:46:07 +08:00
jiaoyangna 14e58ae443 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 16:37:01 +08:00
jiaoyangna 3bb8e284d9 破阵诛仙 2020-08-28 16:36:08 +08:00
ZhangBiao 7058d73193 破阵诛仙 提交 2020-08-21 18:30:44 +08:00
ZhangBiao 54f285807b 代码调整 2020-08-21 14:42:36 +08:00
ZhangBiao b8a8a3980c 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
ZhangBiao aa551923b1 破阵诛仙 珍奇宝阁 2020-08-20 18:32:14 +08:00
jiaoyangna 6b0af3d7fb pozhenzhuxian commit 2020-08-20 17:36:19 +08:00
wangzhenxing 442877d3e0 珍奇宝阁预设代码提交 2020-08-13 16:38:20 +09:00
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
ZhangBiao c2024a15cb bug修复 2020-08-03 20:01:59 +08:00
ZhangBiao ab8889ae8c 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
jiaoyangna d00afc69cf 添加特效 2020-08-06 15:14:47 +08:00
ZhangBiao 8c7b24ad9a bug修复 2020-07-28 20:13:09 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00