jiaoyangna
|
2a5a23f3ed
|
显示优化提交
|
2020-10-16 17:37:54 +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 |
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
|
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 |
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 |
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 |
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 |
yuanshuai
|
a9b9d9467f
|
掷骰子协议修改
|
2020-10-15 12:04:23 +08:00 |
yuanshuai
|
a05cb7cc43
|
协议修改
|
2020-10-15 11:53:03 +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
|
5bf0f64989
|
boss 和 转盘数据 提交
|
2020-10-11 09:40:22 +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 |
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 |
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 |
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 |
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 |
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 |
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 |