jiaoyangna
|
f9c49d00e3
|
宝物bug修改
|
2020-07-09 10:53:15 +08:00 |
jiaoyangna
|
37c7c839c4
|
限时召唤提交
|
2020-07-09 10:04:20 +08:00 |
gaoxin
|
3e43ea4876
|
Merge branch '优化cardrenderer' into master_develop
|
2020-07-08 21:23:04 +08:00 |
gaoxin
|
b5ab2384c3
|
优化rendertexture的数量20->6
|
2020-07-08 21:21:49 +08:00 |
2han9B1a0
|
12d9208f90
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-08 21:19:49 +08:00 |
2han9B1a0
|
7c7684a714
|
冲突提交
|
2020-07-08 21:19:34 +08:00 |
2han9B1a0
|
39d035b21a
|
no message
|
2020-07-08 21:09:45 +08:00 |
gaoxin
|
ce13a0263e
|
Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
# .gitignore
# Assets/ManagedResources/Atlas/QianKunBox.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
# Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
# Assets/StreamingAssets/Android.meta
|
2020-07-08 19:55:09 +08:00 |
jiaoyangna
|
21778b4a74
|
限时提交
|
2020-07-08 19:16:04 +08:00 |
gaoxin
|
da6bb67d50
|
技能配置优化
|
2020-07-08 18:23:12 +08:00 |
2han9B1a0
|
d5bc2b4ef1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-08 16:24:27 +08:00 |
jiaoyangna
|
9b138fe566
|
限时召唤提交
|
2020-07-08 16:23:04 +08:00 |
2han9B1a0
|
1b89e68c95
|
包囊
|
2020-07-08 16:23:02 +08:00 |
jiaoyangna
|
070fb43964
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua
|
2020-07-08 16:20:26 +08:00 |
jiaoyangna
|
1df7a8006a
|
【ID1008244】
【限时招募】阶段奖励进度条显示不准
|
2020-07-08 16:19:46 +08:00 |
2han9B1a0
|
51089bd2c8
|
福利界面报错
|
2020-07-08 11:46:43 +08:00 |
gaoxin
|
b999786cbb
|
部分技能配置
|
2020-07-08 10:34:41 +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 |
2han9B1a0
|
562e482740
|
图鉴bug修改
|
2020-07-07 15:44:19 +08:00 |
zhangqiang
|
bff7df21e4
|
装备出售界面添加
|
2020-07-07 15:20:43 +08:00 |
2han9B1a0
|
bdc2c095a7
|
点将台奖池修改
|
2020-07-07 14:16:28 +08:00 |
2han9B1a0
|
8eaa1f6e8c
|
增加 图鉴、神将归元、恭送神将界面“全部”按钮
|
2020-07-07 10:57:23 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
zhangqiang
|
105d3bf53e
|
宝器分解计算掉落
|
2020-07-06 19:11:15 +08:00 |
2han9B1a0
|
b0bee3f1d7
|
神将界面“全部”按钮
|
2020-07-06 18:37:29 +08:00 |
2han9B1a0
|
e3c9fb459e
|
寻宝文字提示修改,特权界面资源替换
|
2020-07-06 17:01:50 +08:00 |
zhangqiang
|
4b8bae38b3
|
宝物分解界面提交
|
2020-07-06 16:27:27 +08:00 |
zhangqiang
|
9053926e02
|
bug 点将台卡池预览,再查看四元阵卡池,显示的是点将台卡池
|
2020-07-04 17:04:26 +08:00 |
zhangqiang
|
94a160d682
|
修改玩家信息时,应按照位置顺序显示该玩家主线阵容
|
2020-07-04 16:11:14 +08:00 |
zhangqiang
|
74830b4b90
|
开服狂欢奖励预览返回按钮不关闭预览bug
|
2020-07-04 14:24:30 +08:00 |
zhangqiang
|
4630199505
|
提交试试
|
2020-07-03 19:54:34 +08:00 |
gaoxin
|
9c7377e3d6
|
未命中效果添加
|
2020-07-03 18:55:45 +08:00 |
zhangqiang
|
ae8aa71edf
|
成员左右切换动画位置修改
|
2020-07-03 18:25:46 +08:00 |
2han9B1a0
|
f7c842eb9a
|
add zhushi
|
2020-07-03 17:59:10 +08:00 |
gaoxin
|
0bdb498338
|
添加全屏弹道按列区分释放位移
|
2020-07-03 16:50:14 +08:00 |
2han9B1a0
|
e2c5b69f38
|
星级成长里bug修复
|
2020-07-03 16:02:57 +08:00 |
zhangqiang
|
6f30179f57
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-07 13:33:51 +08:00 |
zhangqiang
|
70bbb3cee2
|
竞技场修改
|
2020-07-07 13:29:40 +08:00 |
2han9B1a0
|
abfbfc423b
|
心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
|
2020-07-03 11:27:25 +08:00 |
gaoxin
|
ab98e17e8a
|
添加判断命中的方法
|
2020-07-02 21:33:00 +08:00 |
gaoxin
|
d53bac2d5a
|
修复中毒死亡后依然可以释放技能
|
2020-07-02 21:02:59 +08:00 |
2han9B1a0
|
1796c48583
|
森罗幻境bug修改
|
2020-07-02 20:50:49 +08:00 |
gaoxin
|
5b5577d50b
|
添加全屏弹道技能
|
2020-07-02 19:23:42 +08:00 |
2han9B1a0
|
73c6cc9582
|
删除meta文件
|
2020-07-02 17:58:34 +08:00 |