yuanshuai
|
0fee60ea37
|
【逍遥游】骰子动画修改
|
2020-10-26 15:19:33 +08:00 |
gaoxin
|
71dc347456
|
【逍遥游】删除旧骰子动画,修复新动画缺失的问题
|
2020-10-26 15:18:32 +08:00 |
gaoxin
|
c2db80b5bf
|
【逍遥游】骰子资源提交
|
2020-10-26 15:15:56 +08:00 |
jiaoyangna
|
942849cdcf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 15:06:24 +08:00 |
jiaoyangna
|
ce5db82250
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:05:59 +08:00 |
gaoxin
|
343237ae6d
|
【灵兽】战斗数据协议添加,修复战斗数据组建错误
|
2020-10-26 14:56:03 +08:00 |
zhangqiang
|
0a5816a4ec
|
线上问题工会技能战力修改
|
2020-10-26 14:47:14 +08:00 |
zhangqiang
|
b6f48c4910
|
线上战力 属性取整问题
|
2020-10-26 14:46:43 +08:00 |
wangzhenxing
|
71f365b3e4
|
人物信息显示修改
|
2020-10-26 15:35:03 +09:00 |
jiaoyangna
|
bdfb518274
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:11:44 +08:00 |
jiaoyangna
|
88afa2d704
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 15:07:13 +08:00 |
yuanshuai
|
e37e260678
|
Merge branch 'master_devlop_ys' into master_develop
|
2020-10-26 15:05:43 +08:00 |
yuanshuai
|
afd0b542fe
|
骰子动画修改
|
2020-10-26 15:04:44 +08:00 |
gaoxin
|
1dc2b96916
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 14:57:05 +08:00 |
gaoxin
|
e96bfbdbf5
|
【灵兽】获取全部灵兽信息接口修改返回数组,修复打开灵兽信息界面报错
|
2020-10-26 14:57:01 +08:00 |
zhangqiang
|
982e29b2ba
|
线上问题工会技能战力修改
|
2020-10-26 14:45:29 +08:00 |
gaoxin
|
9ac7e7b9a3
|
Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
|
2020-10-26 14:33:22 +08:00 |
gaoxin
|
4265c533c8
|
【战斗】GM战斗测试数据提交
|
2020-10-26 14:32:48 +08:00 |
zhangqiang
|
21f8a21aec
|
灵兽提交
|
2020-10-26 14:25:35 +08:00 |
gaoxin
|
2eef0bbac5
|
【逍遥游】删除旧骰子动画,修复新动画缺失的问题
|
2020-10-26 14:09:55 +08:00 |
liujiaqi
|
3e9cedaf34
|
设计商店图标
|
2020-11-01 12:15:45 +08:00 |
gaoxin
|
8a455e2c9e
|
【灵兽】后端数据解析添加
|
2020-10-26 14:03:59 +08:00 |
gaoxin
|
7b64ca48d3
|
【灵兽】战斗界面结构修改
|
2020-10-26 11:41:51 +08:00 |
zhangqiang
|
5a72414908
|
灵兽修改提交
|
2020-10-26 11:34:01 +08:00 |
zhangqiang
|
af2364c075
|
线上战力 属性取整问题
|
2020-10-26 11:33:23 +08:00 |
gaoxin
|
fc7b5d2c48
|
【逍遥游】骰子资源提交
|
2020-10-26 10:43:44 +08:00 |
gaoxin
|
3aa5ac3207
|
【社稷大典】特效资源添加
|
2020-10-26 10:26:36 +08:00 |
jiaoyangna
|
11d0d95bde
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-29 10:13:11 +08:00 |
jiaoyangna
|
0a610313a6
|
主题活动图片资源修改提交,累计重置红点检测修改提交
|
2020-10-29 10:12:47 +08:00 |
gaoxin
|
fe7d22e4ae
|
【灵兽】灵兽战斗表现添加
|
2020-10-26 10:13:31 +08:00 |
zhangqiang
|
3fa9583f56
|
灵兽修改提交
|
2020-10-26 10:10:29 +08:00 |
zhangqiang
|
aff128d50a
|
灵兽提交
|
2020-10-24 19:46:10 +08:00 |
gaoxin
|
043304eb18
|
Merge branch 'master_develop' into 0功能/灵兽战斗
|
2020-10-24 18:51:57 +08:00 |
wangzhenxing
|
ac0c59e9a1
|
灵兽显示修改
|
2020-10-24 18:54:14 +09:00 |
wangzhenxing
|
a0270d471b
|
灵兽提交
|
2020-10-24 18:41:20 +09:00 |
zhangqiang
|
1d67775000
|
灵兽提交
|
2020-10-24 18:14:00 +08:00 |
ZhangBiao
|
d36645cc7f
|
【社稷大典】资源修改
|
2020-10-24 17:36:51 +08:00 |
gaoxin
|
bb66461441
|
Merge branch 'master_develop' into 0功能/灵兽战斗
|
2020-10-24 17:17:52 +08:00 |
gaoxin
|
bb23a7541d
|
【灵兽】战斗逻辑添加
|
2020-10-24 17:17:07 +08:00 |
zhangqiang
|
b569a35aea
|
预设合并提交
|
2020-10-24 16:55:06 +08:00 |
wangzhenxing
|
e381b9e771
|
灵兽放生修改提交
|
2020-10-24 16:51:09 +09:00 |
ZhangBiao
|
d2bc65ec48
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-24 16:47:57 +08:00 |
ZhangBiao
|
7b4f959687
|
Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2020-10-24 16:47:45 +08:00 |
jiaoyangna
|
2ad9c6cdeb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-29 16:17:15 +08:00 |
jiaoyangna
|
87b9c2dd0d
|
灵兽羁绊,御兽斋红点提交
|
2020-10-29 16:17:09 +08:00 |
jiaoyangna
|
d3b53a0eba
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-29 15:56:41 +08:00 |
jiaoyangna
|
93758f24f8
|
Merge branch '0功能/灵兽系统' into master_develop
|
2020-10-29 15:55:50 +08:00 |
jiaoyangna
|
92946fe32d
|
baocuo xiugai
|
2020-10-29 15:54:25 +08:00 |
jiaoyangna
|
94c6c2242e
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-29 15:38:39 +08:00 |
jiaoyangna
|
f1c18bcb7b
|
报错修改
|
2020-10-29 15:38:34 +08:00 |
jiaoyangna
|
33b8067bf6
|
漏提
|
2020-10-29 15:10:42 +08:00 |
jiaoyangna
|
2238dc5db4
|
灵兽抽卡 修改
|
2020-10-29 15:08:22 +08:00 |
zhangqiang
|
c791399431
|
灵兽提交
|
2020-10-24 16:44:05 +08:00 |
ZhangBiao
|
c768775e06
|
【社稷大典】加完红点完事了
|
2020-10-24 16:18:57 +08:00 |
zhangqiang
|
3d72b9c0ea
|
灵兽提交 添加羁绊红点预设
|
2020-10-24 16:11:58 +08:00 |
zhangqiang
|
194187e5e5
|
灵兽提交
|
2020-10-24 15:55:41 +08:00 |
zhangqiang
|
3407f7d57e
|
Merge branch '0功能/灵兽系统' into master_develop
# Conflicts:
# Assets/ManagedResources/Icons/ls_01_qingluan_t1.png.meta
# Assets/ManagedResources/Icons/ls_02_huodou_t1.png.meta
# Assets/ManagedResources/Icons/ls_03_yinglong_t1.png.meta
# Assets/ManagedResources/Icons/ls_04_zhulong_t1.png.meta
# Assets/ManagedResources/Icons/ls_05_fenghuang_t1.png.meta
# Assets/ManagedResources/Icons/ls_06_baize_t1.png.meta
# Assets/ManagedResources/Icons/ls_07_jukun_t1.png.meta
|
2020-10-24 15:41:12 +08:00 |
jiaoyangna
|
c2f2c8234b
|
神将修改
|
2020-10-29 13:17:56 +08:00 |
wangzhenxing
|
a853094356
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-24 15:33:00 +09:00 |
zhangqiang
|
19f13e3cf6
|
灵兽连续升级修改
|
2020-10-24 15:25:24 +08:00 |
wangzhenxing
|
e30de8da3f
|
灵兽提交
|
2020-10-24 15:32:39 +09:00 |
zhangqiang
|
0f4cd6d43e
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-24 14:15:45 +08:00 |
zhangqiang
|
7a4cd7ba8f
|
零售品升级升星红点
|
2020-10-24 14:15:35 +08:00 |
ZhangBiao
|
ce11afc1e8
|
添加公会检查 和排行细节修改,初始的进度条积分有问题
|
2020-10-24 13:18:04 +08:00 |
gaoxin
|
ad2b935e26
|
Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_01.prefab.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua.meta
|
2020-10-23 20:58:07 +08:00 |
gaoxin
|
17261cdcda
|
【灵兽】灵兽技能特效资源添加
|
2020-10-23 20:47:17 +08:00 |
gaoxin
|
cadc2d77b2
|
【战斗0.0.8】灵兽战斗结构搭建
|
2020-10-23 20:44:43 +08:00 |
jiaoyangna
|
a595c770a1
|
累计充值修改
|
2020-11-04 00:57:23 +08:00 |
jiaoyangna
|
12967078f0
|
限时召唤修改提交
|
2020-11-04 00:15:26 +08:00 |
jiaoyangna
|
73dce1a7c3
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-23 20:02:33 +08:00 |
jiaoyangna
|
2e962b3cef
|
抽卡界面修改提交
|
2020-10-23 20:02:20 +08:00 |
jiaoyangna
|
a21d28fb83
|
再来十次修改提交
|
2020-10-23 19:38:27 +08:00 |
ZhangBiao
|
d57fc60aa1
|
社稷大典,差个加工会限制和领奖界面
|
2020-10-23 19:34:03 +08:00 |
jiaoyangna
|
e6aad73af4
|
louti
|
2020-10-23 19:31:39 +08:00 |
jiaoyangna
|
1ef09a42f5
|
再来一次界面修改提交
|
2020-10-23 19:30:32 +08:00 |
jiaoyangna
|
7bfec03778
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-23 19:14:31 +08:00 |
jiaoyangna
|
f882c9c70c
|
抽卡提交
|
2020-10-23 19:14:24 +08:00 |
jiaoyangna
|
2f83fdfd95
|
灵兽抽卡回滚提交
|
2020-11-05 05:54:10 +08:00 |
jiaoyangna
|
911c4b9f54
|
xieyi commit
|
2020-11-05 04:11:09 +08:00 |
zhangqiang
|
291cddbb3f
|
灵兽提交
|
2020-10-23 19:10:00 +08:00 |
wangzhenxing
|
7072f53fab
|
合并冲突提交
|
2020-10-23 19:53:45 +09:00 |
wangzhenxing
|
bfaed0d937
|
灵兽放生提交
|
2020-10-23 19:45:14 +09:00 |
zhangqiang
|
e7c981763a
|
language 修改
|
2020-10-23 15:58:38 +08:00 |
zhangqiang
|
2cf881c4d5
|
灵兽提交
|
2020-10-23 15:12:21 +08:00 |
jiaoyangna
|
92cdfa96aa
|
tupian meta commit
|
2020-11-05 03:07:34 +08:00 |
jiaoyangna
|
eee353cc4e
|
generalpopup commit
|
2020-11-05 03:06:53 +08:00 |
jiaoyangna
|
c1b227c26b
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-11-05 03:03:16 +08:00 |
jiaoyangna
|
da88485b4c
|
lingshou zhaohuan tijiao
|
2020-11-05 03:03:08 +08:00 |
jiaoyangna
|
a39bc32ef6
|
灵兽羁绊提交
|
2020-11-04 23:00:32 +08:00 |
jiaoyangna
|
e9f42ce609
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
|
2020-11-04 22:27:36 +08:00 |
jiaoyangna
|
d49c1b97cb
|
灵兽羁绊提交
|
2020-11-04 22:25:59 +08:00 |
zhangqiang
|
6767828cdc
|
Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/Spine/ls_06_baize.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-10-23 14:38:50 +08:00 |
wangzhenxing
|
91ee82c5e1
|
涅槃提交
|
2020-10-23 14:05:50 +09:00 |
wangzhenxing
|
1466227510
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-23 09:55:02 +09:00 |
wangzhenxing
|
22a2789d08
|
灵兽涅槃提交
|
2020-10-23 09:54:49 +09:00 |
zhangqiang
|
7452d795e8
|
灵兽提交
|
2020-10-22 20:50:11 +08:00 |
liujiaqi
|
95072a98c5
|
灵兽商店社稷大典商店标题资源灵兽小头像
|
2020-10-22 19:00:10 +08:00 |
jiaoyangna
|
dbccde8b77
|
累计充值修改提交
|
2020-11-04 05:30:12 +08:00 |
jiaoyangna
|
b6e5225bcf
|
累计充值修改提交
|
2020-11-04 05:23:46 +08:00 |
jiaoyangna
|
aac7afa586
|
主题活动修改
|
2020-11-04 04:34:51 +08:00 |
jiaoyangna
|
205340e73a
|
累计充值修改
|
2020-11-04 04:05:20 +08:00 |
jiaoyangna
|
fca650d5b3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-04 03:51:10 +08:00 |
jiaoyangna
|
14b7b6f4cf
|
累计充值修改
|
2020-11-04 03:51:04 +08:00 |
zhangqiang
|
6d200caf1d
|
灵兽提交 战力改变
|
2020-10-22 18:32:11 +08:00 |
wangzhenxing
|
c5b73fed7f
|
抽卡灵兽修改
|
2020-10-22 16:25:40 +09:00 |
wangzhenxing
|
b49c3f220d
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-22 16:15:57 +09:00 |
zhangqiang
|
eb153fdaa6
|
灵兽提交
|
2020-10-22 16:13:44 +08:00 |
wangzhenxing
|
e193bc2c21
|
灵兽抽卡剩余时间修改
|
2020-10-22 16:15:09 +09:00 |
wangzhenxing
|
1dbfab0029
|
灵兽抽卡显示修改
|
2020-10-22 16:07:38 +09:00 |
wangzhenxing
|
e516aa6c14
|
被动效果修改
|
2020-10-22 14:53:49 +09:00 |
zhangqiang
|
0270d54e10
|
灵兽提交
|
2020-10-22 12:41:44 +08:00 |
jiaoyangna
|
b93bef6237
|
剔除id为0 的礼包
|
2020-10-22 11:26:00 +08:00 |
jiaoyangna
|
7931e3ed1c
|
Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
|
2020-10-22 11:12:17 +08:00 |
zhangqiang
|
83088ea429
|
提交
|
2020-10-22 10:03:46 +08:00 |
jiaoyangna
|
420cef2355
|
无效的红点检测
|
2020-10-21 18:24:17 +08:00 |
wangzhenxing
|
11ccf2ab6f
|
灵兽分解预设提交
|
2020-10-21 17:25:12 +09:00 |
jiaoyangna
|
d555d983ea
|
累计充值修改提交, 灵兽提交
|
2020-10-21 16:05:33 +08:00 |
wangzhenxing
|
02c55bcdb3
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-21 16:41:22 +09:00 |
wangzhenxing
|
80ebcccbbc
|
灵兽放生提交
|
2020-10-21 16:41:11 +09:00 |
zhangqiang
|
74858bdbe7
|
灵兽提交
|
2020-10-21 15:40:23 +08:00 |
jiaoyangna
|
b26ba765bc
|
勇往直前 提交
|
2020-10-21 14:16:02 +08:00 |
zhangqiang
|
f8d6c63368
|
灵兽提交 上阵提交
|
2020-10-21 11:58:16 +08:00 |
gaoxin
|
b72d6b46bb
|
Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit b8eabfe641.
|
2020-10-20 21:17:26 +08:00 |
gaoxin
|
b8eabfe641
|
【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题
|
2020-10-20 20:36:44 +08:00 |
gaoxin
|
8081350fbe
|
【战斗0.0.6】修复判断数据是否存在接口错误
|
2020-10-20 20:26:44 +08:00 |
zhangqiang
|
3a6c14f607
|
灵兽提交
|
2020-10-20 20:18:02 +08:00 |
gaoxin
|
711b240235
|
骰子音效遴选提交
|
2020-10-20 18:10:07 +08:00 |
yuanshuai
|
8cb68ceaa4
|
逍遥游地图界面优化:1.自动游历返回时提示二级确认弹窗 2.记录自动游历状态
|
2020-10-20 18:05:33 +08:00 |
jiaoyangna
|
ecd0cc8f22
|
逍遥游云游宝玉修改提交
|
2020-10-20 17:40:47 +08:00 |
yuanshuai
|
c3a67ef9aa
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-20 16:07:02 +08:00 |
yuanshuai
|
85507e2f6a
|
逍遙游自动游历开启 相关脚本资源提交
|
2020-10-20 16:06:52 +08:00 |
wangzhenxing
|
a3b8be0abe
|
技能期间只触发一次被动触发条件修改
|
2020-10-20 16:20:14 +09:00 |
wangzhenxing
|
ab4fa7925d
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-20 16:17:21 +09:00 |
zhangqiang
|
c6f34794f3
|
灵兽提交
|
2020-10-20 16:08:51 +08:00 |
wangzhenxing
|
4e047140a8
|
灵兽提交
|
2020-10-20 16:17:08 +09:00 |
JieLing
|
3666441445
|
【逍遥游】修复行动力不会恢复满的问题
|
2020-10-20 15:16:07 +08:00 |
JieLing
|
e3cac704d0
|
【逍遥游】优化奖励界面显示
|
2020-10-20 15:16:01 +08:00 |
ZhangBiao
|
23f4b9c65d
|
【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
|
2020-10-20 14:59:25 +08:00 |
gaoxin
|
8aa4abdbeb
|
【逍遥游】云游值自动恢复修改
|
2020-10-20 00:23:42 +08:00 |
gaoxin
|
7ea442ff5d
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
|
2020-10-19 23:52:22 +08:00 |
gaoxin
|
27eaa02a88
|
修复部分奖励不刷新的问题
|
2020-10-19 23:51:15 +08:00 |
yuanshuai
|
92af021625
|
倒计时云游值回复问题修改
|
2020-10-19 23:49:21 +08:00 |
yuanshuai
|
7e0f32ec1f
|
逍遥游bug修改
|
2020-10-19 23:24:07 +08:00 |
gaoxin
|
4eb846d8c3
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:56:22 +08:00 |
gaoxin
|
ba87f5c181
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:56:05 +08:00 |
yuanshuai
|
8f4464e693
|
骰子动画添加提交
|
2020-10-19 22:54:59 +08:00 |
ZhangBiao
|
9bde86217d
|
Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441.
|
2020-10-19 22:23:28 +08:00 |
ZhangBiao
|
acfccff38a
|
Revert "兑换界面修改"
This reverts commit 0467627fe8.
|
2020-10-19 22:23:18 +08:00 |
ZhangBiao
|
57f1a4ee60
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:18:38 +08:00 |
ZhangBiao
|
072ab2ba46
|
逍遥游 commit
|
2020-10-19 22:18:31 +08:00 |
yuanshuai
|
64113b5103
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:12:18 +08:00 |
yuanshuai
|
6a0938655a
|
骰子资源提交
|
2020-10-19 22:12:07 +08:00 |
ZhangBiao
|
ddfca80c45
|
逍遥 commit
|
2020-10-19 21:59:48 +08:00 |
jiaoyangna
|
2d4ce422da
|
monterr gift patface
|
2020-10-19 21:59:07 +08:00 |
jiaoyangna
|
1d8ac73a44
|
拍脸commit
|
2020-10-19 21:57:56 +08:00 |
jiaoyangna
|
1677642f3b
|
tuisonglibao patface
|
2020-10-19 21:57:39 +08:00 |
ZhangBiao
|
ec0f15f489
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 21:40:24 +08:00 |
ZhangBiao
|
bfc4e834e4
|
修改boss 奖励
|
2020-10-19 21:40:17 +08:00 |
yuanshuai
|
d97142bb6d
|
逍遥游脚本修改
|
2020-10-19 21:35:12 +08:00 |
yuanshuai
|
7b40a855b9
|
自动游历功能屏蔽
|
2020-10-19 21:31:33 +08:00 |
yuanshuai
|
4f0f06b359
|
逍遥游红点提交
|
2020-10-19 21:30:31 +08:00 |
ZhangBiao
|
27f8331e62
|
轩辕 修改 提交
|
2020-10-19 21:21:54 +08:00 |
zhangqiang
|
e47a1d5a45
|
灵兽提交
|
2020-10-19 20:30:28 +08:00 |
yuanshuai
|
fab7ff6557
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 20:29:57 +08:00 |
yuanshuai
|
4316c30bf2
|
逍遥游红点和帮助弹窗提交
|
2020-10-19 20:29:49 +08:00 |
wangzhenxing
|
63adfc1097
|
修改188被动 义结金兰不触发其他被动
|
2020-10-19 21:28:47 +09:00 |
wangzhenxing
|
4a21eae8f4
|
188被动普攻排序修改
|
2020-10-19 21:22:13 +09:00 |
jiaoyangna
|
165d29fb73
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 20:21:41 +08:00 |
jiaoyangna
|
0467627fe8
|
兑换界面修改
|
2020-10-19 20:21:36 +08:00 |
jiaoyangna
|
8bed258441
|
逍遥游 兑换界面修改
|
2020-10-19 20:21:01 +08:00 |
gaoxin
|
8f1601a573
|
重复资源删除
|
2020-10-19 20:19:45 +08:00 |
jiaoyangna
|
4a32348f90
|
yushe xiugai
|
2020-10-19 20:10:19 +08:00 |
wangzhenxing
|
cddd7a8824
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-19 21:08:17 +09:00 |
gaoxin
|
f006531707
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 21:05:05 +08:00 |
wangzhenxing
|
f7865231ef
|
被动188 改为血量百分比排序
|
2020-10-19 21:07:53 +09:00 |
jiaoyangna
|
f72b3d8fe0
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 18:33:40 +08:00 |
jiaoyangna
|
875ed67864
|
购买 commit
|
2020-10-19 18:33:29 +08:00 |
zhangqiang
|
086292c67e
|
提交
|
2020-10-19 18:28:29 +08:00 |
yuanshuai
|
95ed2ba352
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 18:19:22 +08:00 |
yuanshuai
|
fdf1fe5724
|
逍遥游脚本修改
|
2020-10-19 18:19:05 +08:00 |
jiaoyangna
|
66a3754adb
|
boss commit
|
2020-10-19 18:03:58 +08:00 |
gaoxin
|
affdfb81aa
|
【逍遥游】地图界面3、4、5位置调整
|
2020-10-19 17:15:16 +08:00 |
zhangqiang
|
034230ffc9
|
提交
|
2020-10-19 16:57:30 +08:00 |
gaoxin
|
0e19f21805
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 16:48:42 +08:00 |
gaoxin
|
27d9738696
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 16:48:23 +08:00 |
gaoxin
|
539be2d810
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 16:46:24 +08:00 |
jiaoyangna
|
56898d9c26
|
逍遥commit
|
2020-10-19 16:41:04 +08:00 |
yuanshuai
|
911bacc56c
|
逍遙游預設脚本提交
|
2020-10-19 16:00:48 +08:00 |
yuanshuai
|
b1c9e0a986
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 15:13:07 +08:00 |
yuanshuai
|
1297d0682b
|
資源提交
|
2020-10-19 15:12:47 +08:00 |
jiaoyangna
|
8baa135cba
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 15:06:33 +08:00 |
jiaoyangna
|
b93b5eaedb
|
xiaoyao commit
|
2020-10-19 15:06:27 +08:00 |
gaoxin
|
be2230ba6d
|
【战斗 0.0.3】尝试修复偶现战斗卡死得问题
|
2020-10-19 14:38:57 +08:00 |
yuanshuai
|
773fb4085e
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 14:38:56 +08:00 |
yuanshuai
|
d844a36917
|
逍遥游脚本提交
|
2020-10-19 14:38:44 +08:00 |
jiaoyangna
|
00cef72905
|
prefab 修改提交
|
2020-10-19 14:25:13 +08:00 |
gaoxin
|
5e12a55f33
|
【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题
|
2020-10-19 14:19:48 +08:00 |
jiaoyangna
|
a2f23a825f
|
灵兽 提交
|
2020-10-19 14:14:52 +08:00 |
jiaoyangna
|
30c03acf1e
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 14:11:11 +08:00 |
jiaoyangna
|
c45d8ac743
|
灵兽 提交
|
2020-10-19 14:10:46 +08:00 |
gaoxin
|
00a39a450b
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 14:08:36 +08:00 |
gaoxin
|
7a540133bd
|
【逍遥游】优化返回逍遥游界面时重置滚动位置的问题
|
2020-10-19 14:08:28 +08:00 |
jiaoyangna
|
01f5227c72
|
xiaoyao commit
|
2020-10-19 13:50:23 +08:00 |
yuanshuai
|
9143bd4236
|
yushetijiao
|
2020-10-19 12:16:20 +08:00 |
yuanshuai
|
aff5e01480
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-19 11:57:59 +08:00 |
yuanshuai
|
964abba2a0
|
逍遥游脚本预设提交
|
2020-10-19 11:53:47 +08:00 |
jiaoyangna
|
707e824aed
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 11:42:22 +08:00 |
gaoxin
|
3b62c91c69
|
优化逍遥游地图进度显示,添加暂不开放的地图处理
|
2020-10-19 11:40:05 +08:00 |
jiaoyangna
|
be359476d4
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 11:39:30 +08:00 |
jiaoyangna
|
86ca33c7a4
|
xiaoyao commit
|
2020-10-19 11:39:11 +08:00 |
gaoxin
|
f3e675903a
|
优化逍遥游地图界面显示,
|
2020-10-19 11:15:32 +08:00 |
wangzhenxing
|
84faff7246
|
Assets/ManagedResources/~Lua/Data/UIData.lua 合并冲突
|
2020-10-19 11:44:43 +09:00 |
zhangqiang
|
92b2c3d6fb
|
提交
|
2020-10-19 10:56:55 +08:00 |
gaoxin
|
fc3a8f78f2
|
逍遥游地图界面提交
|
2020-10-19 10:36:40 +08:00 |
wangzhenxing
|
5c6634d8d8
|
灵兽抽卡提交
|
2020-10-19 11:30:47 +09:00 |
jiaoyangna
|
4077683aaf
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 10:24:48 +08:00 |
jiaoyangna
|
f62f3de37c
|
xiaoyao tijiao
|
2020-10-19 10:24:42 +08:00 |
yuanshuai
|
8735fcf83e
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-17 20:05:28 +08:00 |
yuanshuai
|
8a9b32f050
|
逍遥游显示优化
|
2020-10-17 20:05:16 +08:00 |
jiaoyangna
|
633761b2a4
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-17 20:00:15 +08:00 |
jiaoyangna
|
d4bcdd2975
|
xiaoyao boss xiugai
|
2020-10-17 19:59:11 +08:00 |
gaoxin
|
538660584e
|
【战斗0.0.1】删除log接口参数
|
2020-10-17 18:42:09 +08:00 |
gaoxin
|
fecc48acc2
|
修复关卡推送礼包报错的问题
|
2020-10-17 18:36:29 +08:00 |
yuanshuai
|
82d6754cd0
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-17 18:10:10 +08:00 |
yuanshuai
|
69ed1376aa
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-17 18:09:45 +08:00 |
jiaoyangna
|
efa085707d
|
逍遥commit
|
2020-10-17 18:09:06 +08:00 |
yuanshuai
|
966822040f
|
逍遥游优化
|
2020-10-17 18:06:29 +08:00 |
jiaoyangna
|
5341483985
|
刷新界面
|
2020-10-17 17:09:48 +08:00 |
jiaoyangna
|
00da9f73a7
|
添加次数
|
2020-10-17 17:06:27 +08:00 |
gaoxin
|
8b24a89d56
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-17 16:34:34 +08:00 |
ZhangBiao
|
d029e1866e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-23 17:35:59 +08:00 |
ZhangBiao
|
90a5c3f28d
|
限时召唤 更换主Up神将
|
2020-10-23 17:35:47 +08:00 |
gaoxin
|
149a1f09ac
|
修复治疗暴击时治疗量为0的问题
|
2020-10-17 16:34:24 +08:00 |
jiaoyangna
|
a90bb04673
|
添加云游值消耗
|
2020-10-17 16:07:05 +08:00 |
yuanshuai
|
a7abe7aee5
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-17 14:32:31 +08:00 |
yuanshuai
|
ecd4695a7b
|
逍遥游地图界面预设脚本修改
|
2020-10-17 14:31:23 +08:00 |
jiaoyangna
|
3ccf8c0dc2
|
xiaoyaoyou 修改
|
2020-10-17 14:27:19 +08:00 |
jiaoyangna
|
8635a61e78
|
转盘,boss 修改
|
2020-10-17 13:48:38 +08:00 |
jiaoyangna
|
93218d9e62
|
时间返回修改
|
2020-10-17 13:37:54 +08:00 |
wangzhenxing
|
711986c6a9
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-17 14:11:47 +09:00 |
wangzhenxing
|
bd4f93309f
|
灵兽涅槃,召唤,商店提交
|
2020-10-17 14:11:34 +09:00 |
jiaoyangna
|
cb6e29076a
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 19:19:41 +08:00 |
jiaoyangna
|
0703ea4f45
|
逍遥提交
|
2020-10-16 19:19:37 +08:00 |
yuanshuai
|
f25854797e
|
逍遥游 资源脚本预设提交
|
2020-10-16 18:39:49 +08:00 |
jiaoyangna
|
6db6317da2
|
添加剩余时间接口
|
2020-10-16 18:01:29 +08:00 |
jiaoyangna
|
2a5a23f3ed
|
显示优化提交
|
2020-10-16 17:37:54 +08:00 |
zhangqiang
|
7d2016c812
|
加跳转
|
2020-10-16 17:13:14 +08:00 |
zhangqiang
|
c6627d93e5
|
提交
|
2020-10-16 17:03:53 +08:00 |
zhangqiang
|
179242de4c
|
提交
|
2020-10-16 16:50:27 +08:00 |
yuanshuai
|
7498b4dc01
|
脚本預設提交
|
2020-10-16 15:39:48 +08:00 |
yuanshuai
|
a441b04d91
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 15:04:40 +08:00 |
yuanshuai
|
4017b81bd3
|
逍遙游脚本於是提交
|
2020-10-16 15:04:31 +08:00 |
ZhangBiao
|
dcf74880bc
|
主题活动,势不可挡 霸哥修改
|
2020-10-16 13:58:51 +08:00 |
jiaoyangna
|
3c14447d17
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 10:33:00 +08:00 |
jiaoyangna
|
7b368e3cd9
|
数据报错修改
|
2020-10-16 10:32:50 +08:00 |
yuanshuai
|
2924f06560
|
协议提交
|
2020-10-16 10:25:57 +08:00 |
yuanshuai
|
5877c9e587
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 10:09:40 +08:00 |
jiaoyangna
|
e2ebe3ee18
|
逍遥游事件数据提交
|
2020-10-16 10:06:48 +08:00 |
yuanshuai
|
c54f19b3f1
|
逍遥游脚本
|
2020-10-16 10:06:10 +08:00 |
zhangqiang
|
425023d697
|
提交
|
2020-10-15 20:52:15 +08:00 |
jiaoyangna
|
63ea323a06
|
修改提交
|
2020-10-15 20:30:11 +08:00 |
jiaoyangna
|
6180692b3f
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-15 19:42:44 +08:00 |
jiaoyangna
|
598ca9e91f
|
修改提交
|
2020-10-15 19:41:47 +08:00 |
yuanshuai
|
c954df27f4
|
逍遥游代码修改
|
2020-10-15 19:38:50 +08:00 |
yuanshuai
|
c3e8e60af2
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-15 19:31:46 +08:00 |
wangzhenxing
|
45be005e63
|
灵兽抽卡放生功能提交
|
2020-10-15 20:27:41 +09:00 |
yuanshuai
|
feb8aa2f9f
|
逍遥游脚本预设提交
|
2020-10-15 19:26:17 +08:00 |
jiaoyangna
|
c8a9f3f8db
|
逍遥游提交
|
2020-10-15 17:48:14 +08:00 |
jiaoyangna
|
e76b41d784
|
预设资源提交
|
2020-10-15 17:08:54 +08:00 |
jiaoyangna
|
7d485277aa
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-15 16:52:38 +08:00 |
jiaoyangna
|
7a86931564
|
转盘,招募提交
|
2020-10-15 16:50:56 +08:00 |
yuanshuai
|
a052877b1b
|
逍遥游功能完善
|
2020-10-15 16:30:51 +08:00 |
zhangqiang
|
b93d7d0435
|
提交
|
2020-10-15 15:43:35 +08:00 |
ZhangBiao
|
c65c0beeb9
|
社稷大典 排名奖励提交
|
2020-10-15 15:35:48 +08:00 |
yuanshuai
|
faff35373b
|
预设提交
|
2020-10-15 14:28:27 +08:00 |
jiaoyangna
|
f664ef0af5
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
|
2020-10-15 14:17:36 +08:00 |
jiaoyangna
|
e12a075e2c
|
bosstij
|
2020-10-15 14:16:57 +08:00 |
gaoxin
|
aa72f7dd0d
|
修复活动刷新会导致引导报错的问题
|
2020-10-15 13:36:48 +08:00 |
yuanshuai
|
a9b9d9467f
|
掷骰子协议修改
|
2020-10-15 12:04:23 +08:00 |
yuanshuai
|
a05cb7cc43
|
协议修改
|
2020-10-15 11:53:03 +08:00 |
liujiaqi
|
b205951c26
|
社稷大典兑换道具图标资源
|
2020-10-14 20:19:58 +08:00 |
zhangqiang
|
eaf610e9c2
|
提交
|
2020-10-14 19:41:33 +08:00 |
ZhangBiao
|
2c708ed98d
|
限时活动 tabs调整
|
2020-10-14 17:56:08 +08:00 |
zhangqiang
|
b37b584d68
|
提交
|
2020-10-14 17:10:36 +08:00 |
wangzhenxing
|
aa82e7f13f
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-14 16:58:43 +09:00 |
wangzhenxing
|
be7ba4315a
|
抽卡活动添加灵兽类型
|
2020-10-14 16:58:28 +09:00 |
ZhangBiao
|
74b9f4ec3a
|
Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
|
2020-10-14 14:39:04 +08:00 |
ZhangBiao
|
f45e820dad
|
Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
|
2020-10-14 14:03:57 +08:00 |
ZhangBiao
|
9265a8883c
|
无尽副本出图多次请求商店 修复
|
2020-10-14 11:55:40 +08:00 |
gaoxin
|
63e5be4088
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 22:30:12 +08:00 |
jiaoyangna
|
ea4166a6e3
|
神州令跳转修改
|
2020-10-15 21:49:04 +08:00 |
jiaoyangna
|
2e574adea8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-15 21:26:23 +08:00 |
jiaoyangna
|
5a17813275
|
森罗幻境 修改
|
2020-10-15 21:26:19 +08:00 |
jiaoyangna
|
b4da41b5e5
|
势不可挡页签修改提交
|
2020-10-15 20:50:05 +08:00 |
gaoxin
|
c3198d413d
|
修复无尽副本过渡期间依然可以进入的问题
|
2020-10-13 22:30:06 +08:00 |
jiaoyangna
|
aa4c2a3f9c
|
势不可挡 提交
|
2020-10-13 20:36:01 +08:00 |
wangzhenxing
|
2f8801a230
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 20:51:21 +09:00 |
wangzhenxing
|
65a8e0048a
|
118被动修改: 额外技能不会触发伤害加成,但是会享受加成收益
|
2020-10-13 20:50:57 +09:00 |
zhangqiang
|
c939bab156
|
提交
|
2020-10-13 19:14:34 +08:00 |
ZhangBiao
|
2e57796328
|
礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
|
2020-10-13 19:12:24 +08:00 |
ZhangBiao
|
e063c2c23d
|
推送礼包。。。。
|
2020-10-13 18:39:55 +08:00 |
ZhangBiao
|
b359ae2df9
|
推送礼包 完事儿
|
2020-10-13 17:21:27 +08:00 |
jiaoyangna
|
89c7961154
|
推送礼包修改
|
2020-10-22 03:24:22 +08:00 |
jiaoyangna
|
598eac1d3a
|
推送礼包修改
|
2020-10-22 02:57:40 +08:00 |
zhangqiang
|
f28501a893
|
提交
|
2020-10-13 16:32:50 +08:00 |
ZhangBiao
|
3b19043f34
|
森罗幻境 炸弹使用描述修改
|
2020-10-13 14:00:41 +08:00 |
zhangqiang
|
bf2804f080
|
提交
|
2020-10-13 13:56:41 +08:00 |
ZhangBiao
|
45c9c20dd6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 13:52:41 +08:00 |
ZhangBiao
|
63a1588f66
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-13 13:51:11 +08:00 |
gaoxin
|
91173e3f91
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 12:44:20 +08:00 |
jiaoyangna
|
9a980bf88b
|
主题活动修改
|
2020-10-21 23:20:41 +08:00 |
gaoxin
|
a107de4ebe
|
删除新增的打点事件
|
2020-10-13 12:44:15 +08:00 |
zhangqiang
|
49d2f4e347
|
添加界面 和表
|
2020-10-13 11:47:35 +08:00 |
gaoxin
|
c3e94843c6
|
打点事件新增
|
2020-10-13 11:35:32 +08:00 |
gaoxin
|
557216c617
|
参数分割符修改
|
2020-10-13 10:02:14 +08:00 |
gaoxin
|
c862bc6623
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 09:59:59 +08:00 |
JieLing
|
5db40d2743
|
监听事件未移除正确
|
2020-10-12 20:48:15 +08:00 |
jiaoyangna
|
bd99b9c1ec
|
限时兑换层级错误修改
|
2020-10-12 18:30:14 +08:00 |
jiaoyangna
|
1defb2559f
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 17:12:34 +08:00 |
gaoxin
|
8978b6c906
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-12 17:10:39 +08:00 |
gaoxin
|
e4ceea35af
|
ios包名修改
|
2020-10-12 17:10:28 +08:00 |
jiaoyangna
|
3bb6821083
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:57:22 +08:00 |
jiaoyangna
|
7bd92923da
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:57:15 +08:00 |
wangzhenxing
|
965906baf2
|
修改bug:【ID1010120】
【魂印】5000054 描述传递的伤害是直接伤害,击杀没有触发追击
|
2020-10-12 16:36:59 +09:00 |
ZhangBiao
|
252fec5bbd
|
回春散手动使用次数不刷新修复
|
2020-10-12 16:10:04 +08:00 |
zhangqiang
|
bf37ff8cea
|
打点修改 dev 分支漏提
|
2020-10-12 16:00:12 +08:00 |
zhangqiang
|
f16636b76a
|
线上问题 宝器分解bug
|
2020-10-12 15:54:05 +08:00 |
ZhangBiao
|
f087c0258b
|
|
2020-10-12 15:39:23 +08:00 |
zhangqiang
|
01d537118b
|
线上问题 bug 规避修改位置
|
2020-10-12 15:18:16 +08:00 |
gaoxin
|
faa065f7b1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-12 15:16:14 +08:00 |
gaoxin
|
3ea925661b
|
修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。
|
2020-10-12 15:15:46 +08:00 |
ZhangBiao
|
62f185c859
|
森罗回春散使用bug修改
|
2020-10-12 15:13:37 +08:00 |
ZhangBiao
|
69fee1514f
|
森罗回春散使用 问题修复
|
2020-10-12 14:43:44 +08:00 |
gaoxin
|
2f4bc32d63
|
修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。
|
2020-10-12 14:34:38 +08:00 |
gongjiawei
|
7663abebb6
|
ui音效优化
|
2020-10-12 14:15:50 +08:00 |
zhangqiang
|
2c9d7c7224
|
线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错
|
2020-10-12 14:02:17 +08:00 |
wangzhenxing
|
e50b03ea89
|
修改bug:【ID1010307】
【技能】红孩儿6星天赋,追加普攻必定暴击无效
|
2020-10-12 13:56:58 +09:00 |
zhangqiang
|
99636ac662
|
线上问题 vip 战力计算打开 只是表的 pvp 评分配成0
|
2020-10-12 13:53:59 +08:00 |
ZhangBiao
|
197b1628a3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-12 12:13:20 +08:00 |
zhangqiang
|
756db024dc
|
修复三界降魔头像框点击无反应
(cherry picked from commit 42f0f9b5fe)
|
2020-10-12 12:13:03 +08:00 |
gongjiawei
|
ec0946359e
|
音频更新
|
2020-10-12 11:57:26 +08:00 |
gaoxin
|
285a41ae05
|
修改bug 限时活动itemView报错
|
2020-10-12 11:28:20 +08:00 |
jiaoyangna
|
1184cd3f76
|
【跳转】碧海卷使用按钮跳转位置不正确
|
2020-10-12 11:01:17 +08:00 |
jiaoyangna
|
25d4148059
|
【丹心碧血】限时兑换活动界面黑屏
|
2020-10-12 11:00:31 +08:00 |
jiaoyangna
|
864535ca9b
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
|
2020-10-11 11:11:49 +08:00 |
yuanshuai
|
8487c445a3
|
逍遥游资源预设脚本提交
|
2020-10-15 10:53:00 +08:00 |
jiaoyangna
|
db5dbbf700
|
boss 提交
|
2020-10-11 11:10:07 +08:00 |
jiaoyangna
|
b3fac6731e
|
boss ,转盘协议修改提交
|
2020-10-11 09:45:18 +08:00 |
jiaoyangna
|
5bf0f64989
|
boss 和 转盘数据 提交
|
2020-10-11 09:40:22 +08:00 |
zhangqiang
|
cfb6870a31
|
线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3
|
2020-10-10 19:37:50 +08:00 |
jiaoyangna
|
ba75aab424
|
仙缘事件界面提交
|
2020-10-10 19:18:27 +08:00 |
yuanshuai
|
57c7fd0890
|
逍遥游脚本资源预设提交
|
2020-10-14 16:57:35 +08:00 |
yuanshuai
|
e441f50992
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-14 15:13:36 +08:00 |
yuanshuai
|
4fb85f49e1
|
协议提交
|
2020-10-14 15:09:43 +08:00 |
yuanshuai
|
5925ca9e14
|
协议提交
|
2020-10-13 16:19:33 +08:00 |
jiaoyangna
|
2e0acab378
|
主题活动修改 提交
|
2020-10-10 18:00:16 +08:00 |
wangzhenxing
|
81c39c7422
|
回合数变化以后,添加延时操作,用于一些监听回合变化消息的被动首先执行
|
2020-10-14 16:44:04 +09:00 |
wangzhenxing
|
87be1121e1
|
治疗数值修改受暴击系数和伤害加成影响
|
2020-10-10 18:54:31 +09:00 |
zhangqiang
|
07a0f73f31
|
车迟斗法 抢夺积分选择目标时,最下方应该显示当前玩家名称,而非当前公会名称
|
2020-10-10 18:33:05 +08:00 |
zhangqiang
|
af6186a43d
|
线上活动 森罗幻境达人前端修改2
|
2020-10-10 18:32:18 +08:00 |
wangzhenxing
|
22e9ad1100
|
添加 245-256 被动技能 将一些根据击杀人头数触发的被动改为技能期间只触发一次
|
2020-10-10 17:01:20 +09:00 |
zhangqiang
|
d341a16601
|
线上问题 神将10星后,进阶页签显示红点
|
2020-10-10 15:13:48 +08:00 |
jiaoyangna
|
a2cd90016f
|
Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-10 15:07:52 +08:00 |
zhangqiang
|
d07a74e490
|
线上问题 公会排行 首个没有显示公会名称
|
2020-10-10 14:52:31 +08:00 |
zhangqiang
|
d2f9ffd2db
|
线上活动 森罗幻境达人前端显示
|
2020-10-10 14:51:50 +08:00 |
jiaoyangna
|
85dbe2d053
|
主题活动修改
|
2020-10-10 14:37:04 +08:00 |
jiaoyangna
|
398e7f070b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-16 12:00:21 +08:00 |
jiaoyangna
|
19aee3b717
|
轩辕宝镜黑屏问题解决
|
2020-10-16 12:00:09 +08:00 |
ZhangBiao
|
0ea4b713cb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-10 14:23:53 +08:00 |
ZhangBiao
|
314dee578a
|
大闹天宫节点商店名称与内容不符修复
|
2020-10-10 14:23:34 +08:00 |
zhangqiang
|
c2677fe193
|
限时升级活动打开后 退出一段时间再返回报错
|
2020-10-10 14:13:30 +08:00 |
jiaoyangna
|
2021b40a70
|
【丹心碧血】限时召唤,up卡显示不正确
|
2020-10-10 13:38:49 +08:00 |
ZhangBiao
|
b95d3c2f7d
|
社稷大典增加点击跳转到珍奇宝阁
|
2020-10-10 13:35:39 +08:00 |
ZhangBiao
|
a40150c3cd
|
通用排名奖励界面创建
|
2020-10-10 11:54:13 +08:00 |
gaoxin
|
1b107fa5be
|
如果宝物被分解了,重复穿戴检测会报错
|
2020-10-10 10:34:56 +08:00 |
gaoxin
|
51c02c929c
|
再次修复登录时区服显示错误的问题
|
2020-10-10 09:55:15 +08:00 |
gaoxin
|
38b6d5f239
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-09 21:44:19 +08:00 |
gaoxin
|
f965c26194
|
添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上
|
2020-10-09 21:44:14 +08:00 |
ZhangBiao
|
46edb1a00c
|
中心部分点击领取奖励
|
2020-10-09 19:38:15 +08:00 |
ZhangBiao
|
c55aad07df
|
捐献长按逻辑处理
|
2020-10-09 18:59:37 +08:00 |
ZhangBiao
|
533dc2a8fd
|
修改了图片下方显示,下一步增加长按
|
2020-10-09 17:11:02 +08:00 |
gaoxin
|
1d4d113fe6
|
音效空判断添加
|
2020-10-09 16:12:20 +08:00 |
zhangqiang
|
21550b047f
|
线上问题 无尽副本轮换前5分钟无法进入
|
2020-10-09 15:18:39 +08:00 |
zhangqiang
|
d86658068f
|
线上问题 大闹天宫招募带宝器的英雄是报错
|
2020-10-09 15:15:26 +08:00 |
jiaoyangna
|
33209fa0c9
|
青龙秘宝修改
|
2020-10-15 14:00:21 +08:00 |
jiaoyangna
|
290b0858da
|
丹心碧血主界面icon 修改提交
|
2020-10-15 11:39:53 +08:00 |
jiaoyangna
|
ecdb54f005
|
一键宝物重复穿戴宝物bug 修改
|
2020-10-15 11:23:38 +08:00 |
jiaoyangna
|
ccd0ac635a
|
丹心碧血提交
|
2020-10-15 11:06:45 +08:00 |
wangzhenxing
|
43eef31eae
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-09 16:12:51 +09:00 |
wangzhenxing
|
888ad9a084
|
魂印历战之躯被动 199 及 魂印 义结金兰被动 188 执行顺序修改
|
2020-10-09 16:12:13 +09:00 |
ZhangBiao
|
927cc43b0d
|
社稷大典代码完善提交v1
|
2020-10-09 14:59:14 +08:00 |
ZhangBiao
|
1112953786
|
社稷大典
|
2020-10-09 09:30:02 +08:00 |
zhangqiang
|
eefc951468
|
提交
|
2020-09-30 11:45:49 +08:00 |
JieLing
|
0064670621
|
遴选提交
|
2020-09-30 11:44:00 +08:00 |
jiaoyangna
|
01b300fb30
|
主题活动修改
|
2020-10-15 16:19:59 +08:00 |
jiaoyangna
|
67c728f576
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-30 17:11:42 +08:00 |
jiaoyangna
|
5e97e20e57
|
十绝阵特效修改
|
2020-09-30 17:10:58 +08:00 |
yuanshuai
|
f4879ab650
|
逍遥游地图相关预设脚本修改
|
2020-09-29 18:19:15 +08:00 |
ZhangBiao
|
d15da5d1e7
|
主题活动预设修改
|
2020-09-29 15:59:16 +08:00 |
ZhangBiao
|
f0ccc8caf5
|
丹心碧血 预设提交
|
2020-09-29 15:54:26 +08:00 |
ZhangBiao
|
71cd037aa4
|
Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
|
2020-09-29 15:52:38 +08:00 |
ZhangBiao
|
6524be790b
|
设计大点界面
|
2020-09-29 15:51:25 +08:00 |
wangzhenxing
|
307f8b484f
|
义结金兰魂印bug修改提交
|
2020-09-29 16:36:51 +09:00 |
jiaoyangna
|
8690da53d0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-29 15:35:27 +08:00 |
jiaoyangna
|
574c7d093d
|
丹心碧血图片提交
|
2020-09-29 15:35:08 +08:00 |
wangzhenxing
|
ed1d0e6150
|
灵兽修改提交
|
2020-09-29 16:13:06 +09:00 |
gaoxin
|
9f38a8e436
|
注释无用代码,修复vip奖励领取保错
|
2020-09-28 20:11:57 +08:00 |
gaoxin
|
8c17716e1c
|
默认头像修改
|
2020-09-28 17:34:39 +08:00 |
zhangqiang
|
ef70664094
|
适配
|
2020-09-28 16:57:03 +08:00 |
yuanshuai
|
42d8a70a24
|
逍遥游地图界面提交
|
2020-09-28 16:30:52 +08:00 |
gaoxin
|
029d7d7097
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-28 16:26:26 +08:00 |
gaoxin
|
04cc2529fa
|
战斗log日志优化
|
2020-09-28 16:26:20 +08:00 |
ZhangBiao
|
5320fb5211
|
女人物大小修改
|
2020-09-28 16:05:34 +08:00 |
wangzhenxing
|
b7ecba8fab
|
合并冲突提交
|
2020-09-28 14:57:46 +09:00 |
wangzhenxing
|
663a54c9ed
|
language表提交
|
2020-09-28 14:54:15 +09:00 |
zhangqiang
|
cccab99a11
|
灵兽提交
|
2020-09-28 11:22:47 +08:00 |
ZhangBiao
|
acd0730f5d
|
|
2020-09-28 11:14:17 +08:00 |
gongjiawei
|
e3e1bd33d6
|
音频更新
|
2020-09-28 10:28:02 +08:00 |
jiaoyangna
|
a8b6fdcec3
|
轩辕修改提交
|
2020-09-27 20:20:04 +08:00 |
gaoxin
|
91cd6c7174
|
头像默认显示复原
|
2020-09-27 19:04:17 +08:00 |
jiaoyangna
|
349316e2d7
|
时间销毁
|
2020-09-28 05:01:06 +08:00 |
ZhangBiao
|
22832d895e
|
社稷大典
|
2020-09-27 16:00:15 +08:00 |
zhangqiang
|
0a3f59befa
|
灵兽提交
|
2020-09-27 11:46:09 +08:00 |
ZhangBiao
|
3f00df0ee7
|
Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.
(cherry picked from commit 11b0361f15)
|
2020-09-27 11:17:46 +08:00 |
ZhangBiao
|
d527c81d11
|
|
2020-09-27 10:15:05 +08:00 |
ZhangBiao
|
28bd8d4e73
|
社稷大典 占坑
(cherry picked from commit a97d8c4348)
|
2020-09-27 10:10:51 +08:00 |
jiaoyangna
|
a6fd0d2aa6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 23:10:47 +08:00 |
gaoxin
|
36ebddb517
|
物品框添加头像框的特效
|
2020-09-27 15:04:12 +08:00 |
gaoxin
|
96ac81c098
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-27 13:33:39 +08:00 |
gaoxin
|
525e229273
|
部分界面头像特效添加
|
2020-09-27 13:33:10 +08:00 |
ZhangBiao
|
11b0361f15
|
Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.
|
2020-09-27 11:16:27 +08:00 |
ZhangBiao
|
b606b87bb2
|
Revert ""
This reverts commit d527c81d11.
|
2020-09-27 11:16:21 +08:00 |
ZhangBiao
|
62300c0bff
|
|
2020-09-27 10:15:40 +08:00 |
ZhangBiao
|
a97d8c4348
|
社稷大典 占坑
|
2020-09-27 10:10:16 +08:00 |
jiaoyangna
|
278d9f8943
|
碎片属性图片修改提交
|
2020-09-25 23:09:48 +08:00 |
jiaoyangna
|
af8b461b50
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-10 16:39:53 +08:00 |
jiaoyangna
|
de81143689
|
积天豪礼修改
|
2020-10-10 16:39:30 +08:00 |
zhangqiang
|
637d910b5c
|
灵 受
|
2020-09-25 18:41:07 +08:00 |
ZhangBiao
|
5b47c9c889
|
虚位以待字体颜色修改
|
2020-09-25 18:16:37 +08:00 |
ZhangBiao
|
af8e68da78
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-02 00:18:39 +08:00 |
ZhangBiao
|
90cab5221d
|
三界降魔
|
2020-10-02 00:18:17 +08:00 |
yuanshuai
|
9a5846943a
|
逍遥游入口界面预设脚本提交
|
2020-09-25 17:02:38 +08:00 |
gongjiawei
|
b475b1b159
|
音频更新
|
2020-09-25 17:02:14 +08:00 |
gongjiawei
|
d53b165d16
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 16:43:18 +08:00 |
gongjiawei
|
8fff93eccc
|
音频更新
|
2020-09-25 16:42:56 +08:00 |
gongjiawei
|
6948cb36b6
|
音频更新
|
2020-09-25 15:48:52 +08:00 |
ZhangBiao
|
9b9c094f3b
|
Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-09-25 15:28:37 +08:00 |
ZhangBiao
|
bec9ecf6d3
|
三界降魔
|
2020-09-25 15:24:59 +08:00 |
jiaoyangna
|
afc1d269c2
|
限时折扣提交
|
2020-09-25 15:03:12 +08:00 |
jiaoyangna
|
9937a05d97
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 14:59:27 +08:00 |
jiaoyangna
|
cae421024a
|
积天豪礼添加动画
|
2020-09-25 14:59:05 +08:00 |
zhangqiang
|
f960264667
|
线上 : 战力计算 注释 VIP属性加成
|
2020-09-25 14:49:58 +08:00 |
zhangqiang
|
f40b2050ad
|
灵兽培养部分初始脚本
|
2020-09-25 14:48:10 +08:00 |
liujiaqi
|
4f3b792b42
|
9.25更新,未同步到online,排名头像框123,
|
2020-09-25 14:11:05 +08:00 |
gaoxin
|
e320701f54
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 12:22:17 +08:00 |
gaoxin
|
ac15a97977
|
战斗专属log添加,删除部分无用打印,添加死亡技能检测队列保证死亡技能的优先级最高。
|
2020-09-25 12:22:12 +08:00 |
jiaoyangna
|
49d55c763e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 23:15:11 +08:00 |
jiaoyangna
|
fd4491e5db
|
挂机时间显示
|
2020-09-25 23:15:06 +08:00 |
gongjiawei
|
ab61345d6d
|
音频更新
|
2020-09-25 11:40:17 +08:00 |
wangzhenxing
|
3bf0fbc623
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-09-25 11:46:12 +09:00 |
zhangqiang
|
d485681b07
|
灵兽出战界面预设提交
|
2020-09-25 11:40:57 +08:00 |
wangzhenxing
|
e92fb73587
|
灵兽逻辑提交
|
2020-09-25 11:45:43 +09:00 |
zhangqiang
|
89a7256077
|
线上活动 : 四周活动 天宫达人 问题
|
2020-09-25 09:49:44 +08:00 |
ZhangBiao
|
e98973ff5a
|
三界降魔
|
2020-09-24 20:47:16 +08:00 |
gaoxin
|
dee65cf7e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
|
2020-09-24 20:26:20 +08:00 |
gaoxin
|
69563a13c7
|
每日一键购买礼包金额显示添加
|
2020-09-24 20:25:27 +08:00 |
jiaoyangna
|
2e21ef95ef
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 20:15:50 +08:00 |
jiaoyangna
|
aa4e005be9
|
【青龙秘宝显示优化】修改进入青龙秘宝时自动滑动的位置
|
2020-09-24 20:15:25 +08:00 |
gaoxin
|
e4c274d15c
|
每日一键购买礼包金额显示添加
|
2020-09-24 20:02:27 +08:00 |
gaoxin
|
142d8ccf0e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 19:16:43 +08:00 |
gaoxin
|
293a4baaa5
|
优化挂机时长特权显示,涉及表:PrivilegeTypeConfig
|
2020-09-24 19:16:38 +08:00 |
zhangqiang
|
31d460114b
|
测试
|
2020-09-24 18:34:31 +08:00 |
jiaoyangna
|
1252d11135
|
漏提
|
2020-09-24 18:10:10 +08:00 |
jiaoyangna
|
d600c57b0f
|
【挂机宝箱优化】挂机宝箱上显示当前挂机时长,精确到分
|
2020-09-24 17:55:36 +08:00 |
jiaoyangna
|
c9c943da32
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 17:53:53 +08:00 |
jiaoyangna
|
bfc32b4541
|
百宝商会时间修改
|
2020-09-24 17:53:48 +08:00 |
ZhangBiao
|
442ac463c0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 17:45:26 +08:00 |
ZhangBiao
|
27568910c4
|
在线奖励 一键领取按钮 在线不刷新修复
|
2020-09-24 17:44:50 +08:00 |
gaoxin
|
02f50abafd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 17:26:34 +08:00 |
gaoxin
|
bda6ace7c9
|
添加公告显示控制字段,获取公告接口添加一些参数用于区分提审,测试和正式服
|
2020-09-24 17:26:27 +08:00 |
zhangqiang
|
65e5b41dee
|
竞技场排序 车迟抢夺排序 试炼节点缩小
|
2020-09-24 17:15:57 +08:00 |
ZhangBiao
|
665a5483eb
|
三界降魔
|
2020-09-24 17:07:12 +08:00 |
gaoxin
|
3462835c8f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 16:29:55 +08:00 |
gaoxin
|
7958c3cf44
|
取消重复下单的判断,收不到支付回调时会导致该礼包无法再次购买,正式服已修复
|
2020-09-24 16:29:51 +08:00 |
gaoxin
|
e0caaf8ade
|
开服狂欢登录奖励内容及按钮显示逻辑修改,涉及表格:TreasureTaskConfig
|
2020-09-24 16:26:33 +08:00 |
gaoxin
|
ae25bcb07e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 15:33:58 +08:00 |
gaoxin
|
58158755e3
|
修复抽卡界面特效穿透的问题
|
2020-09-24 15:33:39 +08:00 |
jiaoyangna
|
43a49dee67
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 15:33:03 +08:00 |
jiaoyangna
|
11cb6221f5
|
时间修改
|
2020-09-24 15:32:44 +08:00 |
gaoxin
|
504b525001
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 14:49:02 +08:00 |
gongjiawei
|
80b18f847a
|
音频更新
|
2020-09-24 14:45:52 +08:00 |
zhangqiang
|
fc2fd03f44
|
线上问题 : 工会宣言两处遮挡问题
|
2020-09-24 14:29:41 +08:00 |
jiaoyangna
|
d2c7754349
|
【破阵诛仙】每日任务刷新,剩余时间小于1小时显示分钟 幸运探宝刷新时间显示
|
2020-09-24 14:09:32 +08:00 |
gaoxin
|
d7aabf6a70
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-24 13:39:05 +08:00 |
gaoxin
|
f677614c90
|
修复轩辕宝镜界面第第二次打开没有货币栏的问题
|
2020-09-24 13:38:59 +08:00 |
zhangqiang
|
1e9443b288
|
线上问题 : 提示挑战关卡升级被聊天遮挡
|
2020-09-24 12:53:39 +08:00 |
zhangqiang
|
7a77b968ad
|
线上问题 : 线上问题 招募英雄法宝数据有可能报错
|
2020-09-24 12:52:57 +08:00 |
gongjiawei
|
95769cad10
|
音频更新
|
2020-09-24 11:00:52 +08:00 |
gongjiawei
|
85ed1ccf3f
|
音频更新
|
2020-09-24 10:53:52 +08:00 |
jiaoyangna
|
34cc05a87d
|
青龙秘宝周任务修改,
|
2020-10-02 22:09:01 +08:00 |
jiaoyangna
|
a26839253f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-02 18:42:27 +08:00 |
jiaoyangna
|
5c9fcf1c44
|
跳转限时兑换修改
|
2020-10-02 18:41:55 +08:00 |
ZhangBiao
|
551dcaa01d
|
三界降魔
|
2020-09-23 20:27:29 +08:00 |
gaoxin
|
97b80070ff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-23 17:07:00 +08:00 |
gaoxin
|
f3df717172
|
优化邮件列表中邮件标题的显示
|
2020-09-23 16:58:56 +08:00 |
jiaoyangna
|
4389beca87
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-23 16:56:53 +08:00 |
jiaoyangna
|
2269c50897
|
【活动需求】百宝商会,免费礼包红点
|
2020-09-23 16:56:06 +08:00 |
zhangqiang
|
121901c06e
|
线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-23 15:49:48 +08:00 |
ZhangBiao
|
05fee33df9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-23 15:05:29 +08:00 |
ZhangBiao
|
999ade9823
|
三界除魔 占个坑
|
2020-09-23 15:04:41 +08:00 |
ZhangBiao
|
772ae238ed
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-25 17:32:41 +08:00 |
ZhangBiao
|
7e099596d3
|
限时商市 其珍宝阁 多期机制增加
|
2020-09-25 16:42:25 +08:00 |
zhangqiang
|
5f8b1027ee
|
线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-23 14:51:33 +08:00 |
jiaoyangna
|
543540cd26
|
【查看神将】切换查看的神将时,魂印图标显示不正确
|
2020-09-23 11:39:54 +08:00 |
jiaoyangna
|
e3a34ea941
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-22 18:38:42 +08:00 |
jiaoyangna
|
a9389ec427
|
免费礼包修改
|
2020-09-22 18:38:22 +08:00 |
gaoxin
|
29d509d54a
|
回滚LayoutWrap文件
|
2020-09-22 17:05:41 +08:00 |
gaoxin
|
35a4c61b42
|
修复魂印图鉴界面销毁后再次打开报错的问题
|
2020-09-22 16:59:23 +08:00 |
zhangqiang
|
6a5eb99853
|
灵兽资源提交
|
2020-09-21 11:01:49 +08:00 |
gongjiawei
|
faa7671beb
|
音频更新
|
2020-09-18 14:00:29 +08:00 |
jiaoyangna
|
cfd1f8d51b
|
添加动画
|
2020-09-18 13:43:52 +08:00 |
gongjiawei
|
cfa0849704
|
音频更新
|
2020-09-18 11:49:36 +08:00 |
gongjiawei
|
96601c6f92
|
音频更新
|
2020-09-17 18:02:08 +08:00 |
gaoxin
|
2eeb4af779
|
修复切磋战斗结果只会显示失败的问题
|
2020-09-17 16:23:26 +08:00 |
gongjiawei
|
4e5c64264f
|
音频更新
|
2020-09-17 14:49:50 +08:00 |
zhangqiang
|
d700e0da1c
|
打开充值每日礼包 和 成长礼包 红点检测
|
2020-09-17 14:16:04 +08:00 |
ZhangBiao
|
4041b229cc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-17 12:22:19 +08:00 |
ZhangBiao
|
e13026857d
|
限时兑换onhide function增加
|
2020-09-17 09:49:43 +08:00 |
zhangqiang
|
cbdac88541
|
xuanyuan commit
|
2020-09-16 19:24:32 +08:00 |
zhangqiang
|
b00d112660
|
xuanyaun commit
|
2020-09-16 18:54:48 +08:00 |
zhangqiang
|
d423f61e4b
|
轩辕commit
|
2020-09-16 18:48:21 +08:00 |
zhangqiang
|
97b10ca124
|
打印
|
2020-09-16 18:36:41 +08:00 |
ZhangBiao
|
e6b1832121
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 18:18:36 +08:00 |
ZhangBiao
|
6be45b4e89
|
幸运探宝增加动效
|
2020-09-16 18:18:07 +08:00 |
zhangqiang
|
99d05cb571
|
报错 编译c#代码提交
|
2020-09-16 18:08:40 +08:00 |
liujiaqi
|
04520e4a27
|
新宝物图标
|
2020-09-16 15:39:38 +08:00 |
wangxiaolong
|
293ac2b2f2
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 14:45:28 +08:00 |
wangxiaolong
|
209ba84534
|
添加冗余代码调用 + 修改私有方法名称
|
2020-09-16 14:45:10 +08:00 |
wangxiaolong
|
9dbfd0b9d7
|
重新生成Generate
|
2020-09-16 14:44:38 +08:00 |
wangxiaolong
|
46d5904af0
|
添加冗余代码
|
2020-09-16 14:43:52 +08:00 |
ZhangBiao
|
60a335684d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 14:09:41 +08:00 |
ZhangBiao
|
5cd8e621dc
|
限时活动,限时兑换、礼包抢购增加动效
|
2020-09-16 14:09:31 +08:00 |
jiaoyangna
|
568d7c8ee2
|
万象境入口修改
|
2020-09-16 11:26:06 +08:00 |
ZhangBiao
|
60172f3089
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-16 10:52:16 +08:00 |
ZhangBiao
|
13fff17277
|
在线奖励一键领取
|
2020-09-16 10:52:09 +08:00 |
zhangqiang
|
7332783723
|
音效修改
|
2020-09-16 10:26:34 +08:00 |
zhangqiang
|
e5c91eff67
|
音效
|
2020-09-16 10:14:43 +08:00 |
jiaoyangna
|
b202a02455
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-18 18:34:14 +08:00 |
jiaoyangna
|
35c5de3561
|
适配修改提交
|
2020-09-18 18:34:02 +08:00 |
jiaoyangna
|
52d4ff90c5
|
修改标题
|
2020-09-18 18:17:35 +08:00 |