ZhangBiao
|
d938acc273
|
【竞技场】增加输赢奖励掉落
|
2020-11-23 09:58:22 +08:00 |
zhangqiang
|
ddb5f1b299
|
【日常任务】 11.25 bug 宝箱位置修改
|
2020-11-20 17:36:42 +08:00 |
ZhangBiao
|
bdf45413bc
|
【森罗幻境】敌将详情 敌将位置调整
(cherry picked from commit 2dd30f9ca3)
|
2020-11-17 14:56:42 +08:00 |
zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
ZhangBiao
|
6c8a011528
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 18:01:05 +08:00 |
ZhangBiao
|
46eeceb79d
|
【主题活动】bug修复
|
2020-11-13 18:00:56 +08:00 |
wangzhenxing
|
70e019f837
|
gm 测试战斗添加设置皮肤
|
2020-11-13 17:48:11 +08:00 |
gaoxin
|
bd083a67a3
|
【测试战斗】同步界面修改
|
2020-11-13 17:47:54 +08:00 |
ZhangBiao
|
ee04d93830
|
【灵兽宝阁】增加结束时间
|
2020-11-13 17:07:32 +08:00 |
jiaoyangna
|
f1dfa111f1
|
灵兽特惠 价格修改
|
2020-11-13 15:56:21 +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 |
zhangqiang
|
21988be4e2
|
【觉醒】 觉醒成功替换资源
|
2020-11-13 11:18:46 +08:00 |
zhangqiang
|
e9d984b329
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-12 19:34:29 +08:00 |
ZhangBiao
|
debaf0210c
|
【易经宝库】加号位置调整
|
2020-11-12 18:32:53 +08:00 |
ZhangBiao
|
2563c6bdd6
|
【灵兽宝阁】货币显示修复
|
2020-11-12 18:17:56 +08:00 |
ZhangBiao
|
32afdddb4f
|
【灵兽宝阁】合并到local 预设提交
|
2020-11-12 17:24:14 +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 |
zhangqiang
|
b1128dd88e
|
【献祭坛】适配调试
|
2020-11-12 17:05:34 +08:00 |
zhangqiang
|
8a73056eac
|
【献祭坛】预设微调
|
2020-11-12 17:04:06 +08:00 |
jiaoyangna
|
7fc14ec822
|
[主题活动] 修改提交
|
2020-11-12 16:07:19 +08:00 |
jiaoyangna
|
358ecb8166
|
[玄机妙算] 提交
|
2020-11-12 15:10:52 +08:00 |
zhangqiang
|
492d969a4f
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:40 +08:00 |
zhangqiang
|
cbf9f5cade
|
【觉醒】问题修改
|
2020-11-12 13:55:46 +08:00 |
jiaoyangna
|
a6483b3181
|
[灵兽特惠] 提交
|
2020-11-12 11:31:33 +08:00 |
ZhangBiao
|
1ba753044f
|
【灵兽宝阁】抽卡逻辑完善了
|
2020-11-11 16:53:04 +08:00 |
zhangqiang
|
629eb98f1b
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-11 11:37:26 +08:00 |
zhangqiang
|
90e9e84c64
|
【觉醒】十一星的星级展示修改
|
2020-11-11 11:12:14 +08:00 |
zhangqiang
|
48e6d33b7b
|
【神将觉醒】 效果图 资源 提交
|
2020-11-10 17:29:38 +08:00 |
ZhangBiao
|
d493246f2f
|
【灵兽抽卡】 开坑
|
2020-11-10 11:34:19 +08:00 |
jiaoyangna
|
89a90ae5c5
|
神医天降修改
|
2020-11-10 11:04:19 +08:00 |
zhangqiang
|
6278bb0cc8
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:23 +08:00 |
zhangqiang
|
92d85c4200
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:01 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
zhangqiang
|
85b21b27f0
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-09 18:04:54 +08:00 |
ZhangBiao
|
e6eb5d7673
|
【易经宝库】格子点击位置不准确修复 曾加tips
|
2020-11-09 15:28:24 +08:00 |
zhangqiang
|
f94c84f1cd
|
【觉醒】 增加觉醒页签
|
2020-11-09 15:04:48 +08:00 |
zhangqiang
|
de677bee2f
|
【觉醒】增加脚本
|
2020-11-09 11:13:53 +08:00 |
ZhangBiao
|
9ca403ebff
|
【易经宝库】第三层抽取完成后bug修复
|
2020-11-09 11:09:42 +08:00 |
zhangqiang
|
5c73587f89
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-09 10:16:16 +08:00 |
ZhangBiao
|
de32379f8e
|
【竞技场】竞技场增加输赢奖励
|
2020-11-07 18:52:04 +08:00 |
jiaoyangna
|
6cb1610d31
|
神医天降修改
|
2020-11-07 16:56:53 +08:00 |
jiaoyangna
|
77047346dd
|
神医天降价格修改
|
2020-11-14 14:43:48 +08:00 |
zhangqiang
|
68979d577e
|
【神将觉醒】 觉醒成功界面
|
2020-11-07 15:15:49 +08:00 |
jiaoyangna
|
3a481d6d5f
|
[皮肤]修改提交
|
2020-11-06 21:05:39 +08:00 |
jiaoyangna
|
22038419b7
|
神医天降提交
|
2020-11-06 19:54:00 +08:00 |
zhangqiang
|
1a4349d93b
|
【觉醒】 界面提交
|
2020-11-06 16:23:02 +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 |
yuanshuai
|
327584750a
|
【逍遥游】预设修改提交
|
2020-11-06 15:48:59 +08:00 |
ZhangBiao
|
b98490f233
|
【易经宝库】差一个稿子的动效
|
2020-11-06 15:11:19 +08:00 |
ZhangBiao
|
b516a8c202
|
【易经宝库】没有QA 无法购买
|
2020-11-06 13:36:48 +08:00 |
gaoxin
|
d668e4ffc3
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
|
2020-11-06 11:19:46 +08:00 |
zhangqiang
|
3ae2d1048e
|
【GM】gm工具优化
|
2020-11-06 11:16:24 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
jiaoyangna
|
ccf02fb171
|
【皮肤】添加倒计时
|
2020-11-05 18:26:38 +08:00 |
ZhangBiao
|
476057bd1c
|
【易经宝库】主界面奖励显示 通用奖励界面创建
|
2020-11-04 19:51:58 +08:00 |
jiaoyangna
|
6930561350
|
[皮肤]神将界面修改提交
|
2020-11-04 14:24:35 +08:00 |
jiaoyangna
|
4cb31d8f38
|
[皮肤]提交
|
2020-11-04 10:59:04 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
ZhangBiao
|
e7b132952c
|
【特权商城】报错修改
|
2020-11-03 17:53:14 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
ZhangBiao
|
c3537b3486
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-03 17:05:15 +08:00 |
ZhangBiao
|
81e26c3128
|
【特权商城】增加 灵兽特权礼包 文字描述
|
2020-11-03 17:04:45 +08:00 |
zhangqiang
|
0918acadd4
|
【灵兽系统】 羁绊预设微调
|
2020-11-03 16:10:45 +08:00 |
zhangqiang
|
5d6db87650
|
【灵兽系统】召唤界面 按钮位置有问题
|
2020-11-03 14:51:58 +08:00 |
zhangqiang
|
f8b4befd3c
|
【灵兽系统】 按钮位置调整
|
2020-11-03 14:17:33 +08:00 |
wangzhenxing
|
36b9ffce91
|
【bug】分解界面等级星级显示修改
|
2020-11-02 20:13:57 +09:00 |
wangzhenxing
|
868eb64ae1
|
[bug] 分解神将等级显示999
|
2020-11-02 20:09:24 +09:00 |
JieLing
|
04ba352791
|
【资源】 修改资源路径
|
2020-11-02 19:54:12 +08:00 |
zhangqiang
|
cbe24364ec
|
【灵兽系统】 调主城的位置
|
2020-11-02 18:16:28 +08:00 |
ZhangBiao
|
8640018b87
|
【易经宝库】开坑 搭界面 和做动画
|
2020-11-02 18:05:24 +08:00 |
wangzhenxing
|
5eaa5a725d
|
[灵兽抽卡]灵兽抽卡显示修改
|
2020-11-02 17:19:06 +09:00 |
zhangqiang
|
65b5cff36d
|
【灵兽系统】 修改bug
|
2020-11-02 16:17:33 +08:00 |
wangzhenxing
|
52fbe638f6
|
[灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数
|
2020-11-02 13:59:55 +09:00 |
gaoxin
|
9b65cbba0f
|
【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题
|
2020-11-02 11:55:28 +08:00 |
zhangqiang
|
4cb30990e1
|
【灵兽系统】 bug 需同步
|
2020-11-02 11:52:00 +08:00 |
zhangqiang
|
1cb323a700
|
【灵兽系统】 预设修改
|
2020-11-02 10:16:36 +08:00 |
gaoxin
|
3cdc100777
|
【社稷大典/灵兽】特效资源重新整理
|
2020-11-01 17:00:39 +08:00 |
gaoxin
|
23253f96a2
|
【社稷大典】名字重复的资源处理
|
2020-11-01 16:23:08 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
gaoxin
|
f519c35bbd
|
【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。
|
2020-10-30 13:28:19 +08:00 |
jiaoyangna
|
39dbd3f640
|
逍遥游幸运转盘提交
|
2020-10-30 13:27:45 +08:00 |
jiaoyangna
|
1e2688e84c
|
【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印
|
2020-10-30 10:09:11 +08:00 |
ZhangBiao
|
33e1ba20e8
|
【社稷大典】商店适配
|
2020-10-27 16:32:43 +08:00 |
ZhangBiao
|
35f6a6c430
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
|
2020-10-27 16:16:10 +08:00 |
ZhangBiao
|
acd3f336e9
|
【设计大典】特效添加
|
2020-10-27 16:15:34 +08:00 |
JieLing
|
4b522dd9ea
|
【积天豪礼】$1 -> $0.99
|
2020-10-27 13:51:11 +08:00 |
JieLing
|
7870934f0c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:58:03 +08:00 |
yuanshuai
|
0ea67ffa33
|
【逍遥游】骰子动画优化,隐藏动画下面的黑影
|
2020-10-26 18:57:45 +08:00 |
jiaoyangna
|
5d3d65871a
|
[主题活动-社稷大典]商店立绘重叠提交
|
2020-10-26 18:44:57 +08:00 |
ZhangBiao
|
6eea05fa06
|
【竞技场】领奖界面报错修改
|
2020-10-26 17:30:26 +08:00 |
jiaoyangna
|
d8f5a48811
|
【累计充值】提示修改
|
2020-10-26 16:51:47 +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 |
yuanshuai
|
0fee60ea37
|
【逍遥游】骰子动画修改
|
2020-10-26 15:19:33 +08:00 |
jiaoyangna
|
ce5db82250
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:05:59 +08:00 |
zhangqiang
|
6654c9c3b8
|
【大闹天宫】 新增需求 增加圣物 新标 提示
|
2020-12-05 13:20:42 +08:00 |
ZhangBiao
|
383fa08e90
|
【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
|
2021-01-14 21:14:04 +08:00 |
ZhangBiao
|
6407abc8c9
|
【社稷大典】提交8 漏题补
|
2020-10-26 11:53:53 +08:00 |
ZhangBiao
|
0bf6e05add
|
【社稷大典】提交6
|
2020-10-24 18:58:07 +08:00 |
ZhangBiao
|
a2a870f421
|
【社稷大典】提交4
|
2020-10-24 18:41:21 +08:00 |
ZhangBiao
|
a62dc62ead
|
【社稷大典】提交
|
2020-10-24 18:20:43 +08:00 |
yuanshuai
|
3b10d60477
|
自动游历功能屏蔽
|
2020-10-20 16:25:14 +08:00 |
yuanshuai
|
885de6fe9b
|
逍遙游自动游历开启 相关脚本资源提交
|
2020-10-20 16:17:13 +08:00 |
JieLing
|
94b5898ba0
|
【逍遥游】优化奖励界面显示
|
2020-10-20 02:21:32 +08:00 |
JieLing
|
bb2b8b1818
|
【竞技场】修复奖励界面打不开的问题
|
2020-10-20 01:56:42 +08:00 |
jiaoyangna
|
d39c078888
|
xiaoyao commit
|
2020-10-19 23:37:24 +08:00 |
yuanshuai
|
0d4fd1a210
|
骰子动画添加提交
|
2020-10-19 22:56:56 +08:00 |
ZhangBiao
|
a40b0dab17
|
逍遥游 commit
|
2020-10-19 22:38:57 +08:00 |
ZhangBiao
|
021692dc42
|
逍遥commit
|
2020-10-19 22:36:43 +08:00 |
yuanshuai
|
a19942820e
|
自动游历功能屏蔽
|
2020-10-19 21:40:53 +08:00 |
yuanshuai
|
3b8317a897
|
逍遥游红点提交
|
2020-10-19 21:40:48 +08:00 |
yuanshuai
|
131d1aab1b
|
【逍遥游】红点和帮助弹窗提交
|
2020-10-19 21:39:48 +08:00 |
gaoxin
|
19135670ce
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-19 20:40:14 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
56f5856a71
|
宝箱个数减负
|
2020-10-19 20:10:53 +08:00 |
ZhangBiao
|
4c5065ccf7
|
竞技场界面修改
|
2020-10-19 18:52:36 +08:00 |
ZhangBiao
|
09c3da664e
|
通用奖励界面 设计大典->竞技场界面修改
|
2020-10-19 13:54:08 +08:00 |
ZhangBiao
|
bae7d6550e
|
竞技场界面修改
|
2020-10-16 19:36:21 +08:00 |
jiaoyangna
|
9706c45942
|
主题活动修改
|
2020-10-10 16:15:27 +08:00 |
jiaoyangna
|
aa9878a1f2
|
势不可挡 提交
|
2020-10-10 16:14:18 +08:00 |
jiaoyangna
|
04e6526819
|
神州令修改提交
|
2020-10-15 21:48:41 +08:00 |
ZhangBiao
|
2469c75f90
|
森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
(cherry picked from commit 677dca14e7)
|
2020-10-13 14:01:47 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
ZhangBiao
|
2e45c0cd83
|
主题活动预设修改
|
2020-10-15 14:05:24 +08:00 |
zhangqiang
|
fc45eaf562
|
四元阵单抽卡适配
|
2020-09-28 17:53:46 +08:00 |
jiaoyangna
|
6f0b87c858
|
轩辕适配修改,文字颜色修改
|
2020-09-28 16:56:22 +08:00 |
JieLing
|
170b706504
|
修复引导商店报错
|
2020-09-28 11:13:11 +08:00 |
JieLing
|
823ae72aec
|
修复0元礼包无法购买的问题,修复引导合成碎片卡死
|
2020-09-28 10:27:06 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
JieLing
|
c3cce0b06e
|
百宝商会活动添加
|
2020-09-27 16:52:40 +08:00 |
ZhangBiao
|
def3e829ff
|
三界降魔
|
2020-09-27 16:44:39 +08:00 |
ZhangBiao
|
97f9b8f671
|
遴选三界除魔
|
2020-09-27 16:44:31 +08:00 |
ZhangBiao
|
d601794a17
|
三界降魔
|
2020-09-27 16:43:49 +08:00 |
ZhangBiao
|
e9b994126e
|
三界降魔
|
2020-09-27 16:43:42 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
gaoxin
|
5b7e3c7a9b
|
每日一键购买礼包金额显示添加
|
2020-09-27 16:15:46 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
ZhangBiao
|
e3b387b8af
|
十绝阵奖励偏移修改
|
2020-09-22 17:39:14 +08:00 |
JieLing
|
d440edea11
|
打开兑换码功能
|
2020-09-09 20:12:11 +08:00 |
zhangqiang
|
604de656df
|
巅峰赛战斗结束界面适配
|
2020-09-07 15:39:57 +08:00 |
gaoxin
|
a46ee1c52c
|
修复引导急速探索报错的问题
|
2020-09-07 15:26:37 +08:00 |
zhangqiang
|
5a917b1374
|
巅峰赛详情适配
|
2020-09-07 15:02:16 +08:00 |
gaoxin
|
06afe99236
|
宽屏边缘用图片代替黑边
|
2020-09-05 19:02:20 +08:00 |
gaoxin
|
7afe25a5d2
|
界面适配修改,引导添加网络延时检测
|
2020-09-05 17:21:09 +08:00 |
gaoxin
|
338b7b4375
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-05 16:44:07 +08:00 |