zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08: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
|
ade7ee88bc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:19:06 +08:00 |
ZhangBiao
|
24381aba57
|
森罗bug修复
|
2020-08-04 16:18:48 +08:00 |
zhangqiang
|
e11b5fd7bb
|
寻宝红点修改 添加解锁新章节音效
|
2020-08-04 15:33:44 +08:00 |
gaoxin
|
04e6c2fb42
|
删除不必要的符号
|
2020-08-03 21:23:16 +08:00 |
ZhangBiao
|
9b28e7c140
|
森罗bug修改
|
2020-08-03 16:59:37 +08:00 |
jiaoyangna
|
89dbd09856
|
resolve hero tails update
|
2020-08-03 10:32:20 +08:00 |
gaoxin
|
0a19c1dd82
|
优化红点检测机制为分帧刷新,优化人物升级红点检测
|
2020-08-01 13:15:27 +08:00 |
jiaoyangna
|
7a0848100a
|
resolve hero tails update
|
2020-07-31 18:36:54 +08:00 |
zhangqiang
|
93c1913a73
|
适配修改
|
2020-08-19 03:31:43 +08:00 |
ZhangBiao
|
dd06fc4652
|
充值入口恢复,加 充值switch
|
2020-07-31 13:35:15 +08:00 |
ZhangBiao
|
44ace7a129
|
充值入口恢复
|
2020-07-31 10:33:05 +08:00 |
zhangqiang
|
1ac12b1721
|
妖精单抽提示数量错误修改
|
2020-08-15 23:23:38 +08:00 |
ZhangBiao
|
ee4ecf49c2
|
森罗环境 炸弹 终于完了
|
2020-07-29 20:18:19 +08:00 |
ZhangBiao
|
72fef2124a
|
|
2020-07-29 16:27:56 +08:00 |
ZhangBiao
|
4ab1e8c02d
|
点将台 汇聚箱 充值提示 关闭
|
2020-07-29 16:12:17 +08:00 |
ZhangBiao
|
6c316bf7de
|
|
2020-07-28 17:25:50 +08:00 |
ZhangBiao
|
a732396286
|
修复【乾坤宝】抽取获得的预览,可以操作装备出售
|
2020-07-28 15:57:36 +08:00 |
ZhangBiao
|
1868a14b08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:24:21 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
jiaoyangna
|
119c4e4204
|
漏提
|
2020-07-28 15:16:04 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
jiaoyangna
|
46f091f09c
|
头像框修改提交
|
2020-07-25 20:28:41 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +08:00 |
zhangqiang
|
a24c1e2016
|
暂时屏蔽加一种道具
|
2020-09-11 21:53:12 +08:00 |
jiaoyangna
|
a688050060
|
修改星星提交
|
2020-07-25 14:21:33 +08:00 |
jiaoyangna
|
caadda04e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
|
2020-07-24 20:04:44 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
zhangqiang
|
abfde3e8a9
|
巅峰战bug and 使用按钮需求
|
2020-08-24 21:46:19 +08:00 |
ZhangBiao
|
d398804a83
|
--(24暂时关闭)
|
2020-07-24 16:38:04 +08:00 |
ZhangBiao
|
7b795f0daa
|
森罗bug
|
2020-07-23 19:05:43 +08:00 |
ZhangBiao
|
e266292288
|
关卡掉落装备显示问题修复
|
2020-07-23 11:19:27 +08:00 |
jiaoyangna
|
ba8b5a3c93
|
【宝物合成】一键合成预览处显示错误
|
2020-07-22 15:50:18 +08:00 |
ZhangBiao
|
a07830ea52
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-21 14:36:54 +08:00 |
ZhangBiao
|
9f9f430976
|
道具标签不对应修改
|
2020-07-21 14:36:15 +08:00 |
gaoxin
|
02b37b2d67
|
Merge branch 'master_develop' into master_test
|
2020-07-20 19:58:43 +08:00 |
ZhangBiao
|
c0d053c65c
|
免费抽刷新时间
|
2020-07-20 10:02:12 +08:00 |
gaoxin
|
5c962f330a
|
Merge branch '接入SDK' into master_test
# Conflicts:
# Assets/Effect.meta
# BuildABs/Android/files.unity3d
# BuildABs/Android/lzma/luabytes.unity3d
# BuildABs/Android/lzma/resconfigs.unity3d
# ProjectSettings/ProjectSettings.asset
|
2020-07-18 19:55:02 +08:00 |
gaoxin
|
a1acdd13fb
|
支付接口接入,打点数据完善
|
2020-07-18 19:24:19 +08:00 |
jiaoyangna
|
e63fb9e0cf
|
修改文字
|
2020-07-17 14:35:38 +08:00 |
jiaoyangna
|
7faa067c52
|
宝物分解提交
|
2020-07-17 14:15:42 +08:00 |
jiaoyangna
|
96c16ca7f8
|
去掉log
|
2020-07-17 11:38:18 +08:00 |
jiaoyangna
|
adc5895d94
|
首充十级英雄属性天赋错误修改提交
|
2020-07-17 11:16:44 +08:00 |
ZhangBiao
|
a27c474098
|
协议
|
2020-07-16 17:28:48 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
ZhangBiao
|
afa02aae2e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 13:45:50 +08:00 |
ZhangBiao
|
9d47ce9767
|
小游戏bug修复
|
2020-07-16 13:45:07 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
ZhangBiao
|
2ab6d17841
|
森罗小游戏修改
|
2020-07-14 21:03:44 +08:00 |
zhangqiang
|
592d3385e8
|
129 战力计算
|
2020-07-14 14:49:15 +08:00 |
jiaoyangna
|
b2c9b88991
|
【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
|
2020-07-13 16:16:56 +08:00 |
jiaoyangna
|
6ff6b5315b
|
分解、重置相关功能修改
|
2020-07-13 11:15:53 +08:00 |
jiaoyangna
|
fdf82e47ac
|
分解、重置相关功能修改
|
2020-07-11 18:00:07 +08:00 |
jiaoyangna
|
106a7f7763
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
|
2020-07-11 16:25:30 +08:00 |
jiaoyangna
|
0fb81547d3
|
分解提交
|
2020-07-11 16:21:15 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +08:00 |
jiaoyangna
|
c15b84b096
|
Merge branch 'master_develop' into equip
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
|
2020-07-07 18:13:34 +08:00 |
jiaoyangna
|
c6bfa772e5
|
装备提交
|
2020-07-07 16:35:57 +08:00 |
zhangqiang
|
bff7df21e4
|
装备出售界面添加
|
2020-07-07 15:20:43 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
zhangqiang
|
105d3bf53e
|
宝器分解计算掉落
|
2020-07-06 19:11:15 +08:00 |
zhangqiang
|
4b8bae38b3
|
宝物分解界面提交
|
2020-07-06 16:27:27 +08:00 |
zhangqiang
|
94a160d682
|
修改玩家信息时,应按照位置顺序显示该玩家主线阵容
|
2020-07-04 16:11:14 +08:00 |
zhangqiang
|
74830b4b90
|
开服狂欢奖励预览返回按钮不关闭预览bug
|
2020-07-04 14:24:30 +08:00 |
2han9B1a0
|
abfbfc423b
|
心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
|
2020-07-03 11:27:25 +08:00 |
gaoxin
|
edc24d7efd
|
修复获取奖励卡顿的问题
|
2020-07-02 17:01:40 +08:00 |
JieLing
|
461c64b04a
|
svn逻辑同步
|
2020-07-02 14:53:44 +08:00 |
JieLing
|
b3c70f66e4
|
svn逻辑tongbu
|
2020-07-01 18:14:03 +08:00 |
JieLing
|
c4751eed0a
|
svn逻辑同步
|
2020-07-01 10:54:39 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
2db43096de
|
补充提交
|
2020-06-12 18:04:22 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
7dea7af830
|
同步
|
2020-05-15 17:03:13 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |