liujiaqi
|
09270d8f85
|
限时招募累计奖励召唤次数修改
|
2020-07-08 14:46:33 +08:00 |
2han9B1a0
|
51089bd2c8
|
福利界面报错
|
2020-07-08 11:46:43 +08:00 |
liujiaqi
|
46850f0dd4
|
乾坤宝囊问号
|
2020-07-08 11:14:36 +08:00 |
gaoxin
|
b999786cbb
|
部分技能配置
|
2020-07-08 10:34:41 +08:00 |
shihongyi
|
e5d8e83c7f
|
修复bug调整部分概率
|
2020-07-08 10:10:17 +08:00 |
2han9B1a0
|
272cfdc71a
|
乾坤包囊
|
2020-07-08 09:41:56 +08:00 |
2han9B1a0
|
4aed395ed3
|
乾坤包囊
|
2020-07-08 09:40:36 +08:00 |
jiaoyangna
|
67b4631368
|
高级探宝提交
|
2020-07-07 20:13:36 +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
|
0f611408b8
|
合成装备刷新界面
|
2020-07-07 17:51:02 +08:00 |
2han9B1a0
|
9d8deac0e1
|
背包界面报错修改
|
2020-07-07 17:27:48 +08:00 |
jiaoyangna
|
c6bfa772e5
|
装备提交
|
2020-07-07 16:35:57 +08:00 |
gaoxin
|
210114f62f
|
技能配置添加
|
2020-07-07 15:59:17 +08:00 |
2han9B1a0
|
562e482740
|
图鉴bug修改
|
2020-07-07 15:44:19 +08:00 |
zhangqiang
|
0a824f56ee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-07 15:21:37 +08:00 |
zhangqiang
|
bff7df21e4
|
装备出售界面添加
|
2020-07-07 15:20:43 +08:00 |
liujiaqi
|
49a132852a
|
抽卡次数修正,装备叠加数量修改
|
2020-07-07 15:12:20 +08:00 |
gaoxin
|
3b7e9e2cdd
|
特效文件新增
|
2020-07-07 14:33:48 +08:00 |
2han9B1a0
|
bdc2c095a7
|
点将台奖池修改
|
2020-07-07 14:16:28 +08:00 |
2han9B1a0
|
504e6010e3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-07 10:57:34 +08:00 |
2han9B1a0
|
8eaa1f6e8c
|
增加 图鉴、神将归元、恭送神将界面“全部”按钮
|
2020-07-07 10:57:23 +08:00 |
gaoxin
|
64059c7808
|
导表工具优化,语言表路径修改
|
2020-07-07 09:48:38 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
shihongyi
|
96d5d080d5
|
超值基金2期bug、公会人数调整
|
2020-07-06 19:58:55 +08:00 |
zhangqiang
|
105d3bf53e
|
宝器分解计算掉落
|
2020-07-06 19:11:15 +08:00 |
2han9B1a0
|
39abbef905
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-06 18:38:11 +08:00 |
2han9B1a0
|
b0bee3f1d7
|
神将界面“全部”按钮
|
2020-07-06 18:37:29 +08:00 |
shihongyi
|
c9668c674c
|
Merge branch 'master' into master_develop
# Conflicts:
# .gitignore
|
2020-07-06 17:57:51 +08:00 |
shihongyi
|
6cee0b79fe
|
xunbaobug
|
2020-07-06 17:50:27 +08:00 |
shihongyi
|
d6e292caa6
|
Revert "tiangongtanbaobug"
This reverts commit d76752e426 .
|
2020-07-06 17:48:29 +08:00 |
shihongyi
|
d76752e426
|
tiangongtanbaobug
|
2020-07-06 17:47:25 +08:00 |
2han9B1a0
|
9c698254a7
|
删除 英雄、战斗界面的特权显示
|
2020-07-06 17:10:49 +08:00 |
2han9B1a0
|
e3c9fb459e
|
寻宝文字提示修改,特权界面资源替换
|
2020-07-06 17:01:50 +08:00 |
zhangqiang
|
4b8bae38b3
|
宝物分解界面提交
|
2020-07-06 16:27:27 +08:00 |
gaoxin
|
903cd68134
|
文件名修改
|
2020-07-06 11:59:53 +08:00 |
gaoxin
|
4508220751
|
bat文件添加
|
2020-07-06 11:58:59 +08:00 |
gaoxin
|
1251f17d4d
|
尝试命令行执行
|
2020-07-06 11:02:40 +08:00 |
gaoxin
|
5a2a3f83d2
|
excel 工具完善
|
2020-07-06 10:56:55 +08:00 |
skuld
|
ea3ed57c57
|
将每日抽卡上限修改回99999
|
2020-07-06 10:53:42 +08:00 |
gaoxin
|
d62d808e80
|
提交
|
2020-07-06 10:09:45 +08:00 |
gaoxin
|
608c296452
|
导表工具优化
|
2020-07-05 19:21:15 +08:00 |
zhangqiang
|
9053926e02
|
bug 点将台卡池预览,再查看四元阵卡池,显示的是点将台卡池
|
2020-07-04 17:04:26 +08:00 |
zhangqiang
|
608558d3cd
|
中文表 不提竞技场报错
|
2020-07-04 16:19:47 +08:00 |
zhangqiang
|
16bf6d9f7e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-04 16:13:24 +08:00 |
zhangqiang
|
94a160d682
|
修改玩家信息时,应按照位置顺序显示该玩家主线阵容
|
2020-07-04 16:11:14 +08:00 |
gaoxin
|
55d52887a0
|
误删恢复
|
2020-07-04 15:34:30 +08:00 |
gaoxin
|
a7fcbbc722
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-04 15:32:38 +08:00 |
gaoxin
|
2552afa72e
|
忽略lua数据表文件
|
2020-07-04 15:32:09 +08:00 |
zhangqiang
|
385a8c86a1
|
bug 新手引导福利位置偏
|
2020-07-04 15:26:36 +08:00 |
zhangqiang
|
bc9dae0cff
|
漏提
|
2020-07-04 14:27:21 +08:00 |