jiaoyangna
|
5dc0ea68ab
|
无尽副本提交
|
2021-05-27 15:35:10 +08:00 |
zhangqiang
|
56463b82bb
|
【漏提】
|
2021-05-27 15:20:21 +08:00 |
jiaoyangna
|
a9b52e6834
|
无尽副本修改提交
|
2021-05-27 15:16:46 +08:00 |
jiaoyangna
|
7779c1dbb1
|
无尽副本修改提交
|
2021-05-27 15:04:21 +08:00 |
gaoxin
|
417a46815f
|
【日常副本】资源替换
|
2021-05-27 14:56:18 +08:00 |
ZhangBiao
|
a6512d2778
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 14:44:59 +08:00 |
ZhangBiao
|
f832ecfc33
|
【修行】玩家信息界面显示的神印图标,在一行和两行的玩家之间切换,有遮挡
|
2021-05-27 14:44:49 +08:00 |
zhangqiang
|
397d24ee32
|
【山河社稷图】胜利条件显示增加
|
2021-05-27 14:40:34 +08:00 |
ZhangBiao
|
0c78275a6e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 14:09:51 +08:00 |
ZhangBiao
|
e615af9011
|
【福星高照】bug修改
|
2021-05-27 14:09:39 +08:00 |
zhangqiang
|
0bcd6ade1f
|
【山河社稷图】bug + 资源 前端得刷资源
|
2021-05-27 14:06:20 +08:00 |
jiaoyangna
|
7d5ff8c3f1
|
设置按钮修改
|
2021-05-27 14:05:05 +08:00 |
gaoxin
|
3870a1cec6
|
【竞技场】在线跨0点,免费次数不刷
|
2021-05-27 11:43:27 +08:00 |
jiaoyangna
|
f49cefd6b3
|
战斗结算修改
|
2021-05-27 11:23:38 +08:00 |
zhangqiang
|
ac0feb82be
|
【bug】
|
2021-05-27 11:07:32 +08:00 |
gaoxin
|
bccaf6557c
|
【巅峰赛】巅峰赛赛程界面报错
|
2021-05-27 11:04:44 +08:00 |
gaoxin
|
538c8d984e
|
【主界面】优化提示框层级问题
|
2021-05-27 10:47:04 +08:00 |
jiaoyangna
|
da6437e2a2
|
无尽提交
|
2021-05-27 10:46:22 +08:00 |
gaoxin
|
7a972628c3
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-27 10:19:53 +08:00 |
ZhangBiao
|
e0a5d6d134
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 10:04:08 +08:00 |
ZhangBiao
|
7ddf0dd07f
|
【福星高照】按钮提交
|
2021-05-27 10:03:57 +08:00 |
zhangqiang
|
f758982d32
|
【山河社稷图】跳转
|
2021-05-27 09:50:11 +08:00 |
jiaoyangna
|
b197244667
|
无尽副本修改提交
|
2021-05-27 09:46:56 +08:00 |
ZhangBiao
|
6677cac6d4
|
【主城】小人重复生成修复
|
2021-05-27 09:43:41 +08:00 |
ZhangBiao
|
5ce0867bd2
|
【修行】修行玩法里提升战力,排行榜战力刷新不及时
|
2021-05-27 09:28:10 +08:00 |
ZhangBiao
|
9d4ec4495d
|
【云游商人】无可替换装备时,去除二次弹窗,改为系统提示
|
2021-05-27 09:23:45 +08:00 |
jiaoyangna
|
5470197797
|
小怪正常战斗,结束时未弹出战斗结算界面
|
2021-05-26 22:56:53 +08:00 |
jiaoyangna
|
7baad945bf
|
无尽提交
|
2021-05-26 22:14:17 +08:00 |
jiaoyangna
|
35d0927881
|
无尽副本修改提交
|
2021-05-26 22:00:33 +08:00 |
ZhangBiao
|
913bc640cd
|
【修行】大入口有红点,里面没有可操作的东西
|
2021-05-26 21:09:07 +08:00 |
ZhangBiao
|
35acdf34ef
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 21:05:16 +08:00 |
ZhangBiao
|
bc2c2eb916
|
【主城】主城小人,看不见自己,
|
2021-05-26 21:05:06 +08:00 |
jiaoyangna
|
736293cbe9
|
头像框颜色提交
|
2021-05-26 20:53:18 +08:00 |
zhangqiang
|
66c024eeae
|
【山河社稷图】bug
|
2021-05-26 20:47:41 +08:00 |
ZhangBiao
|
e169ed3e9b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 20:31:18 +08:00 |
ZhangBiao
|
9ce432d885
|
【修行】神印未解锁不可查看
|
2021-05-26 20:31:01 +08:00 |
jiaoyangna
|
107d20677a
|
无尽副本提交
|
2021-05-26 20:27:39 +08:00 |
zhangqiang
|
dbee1bef07
|
【山河社稷图】bug
|
2021-05-26 20:21:55 +08:00 |
zhangqiang
|
aca4aa47ac
|
【音效修改】
|
2021-05-26 19:40:03 +08:00 |
ZhangBiao
|
f7e8bd99b6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 18:32:14 +08:00 |
ZhangBiao
|
53703a8f2e
|
【修行】属性顺序
|
2021-05-26 18:32:03 +08:00 |
jiaoyangna
|
8f6fce191b
|
无尽任务提交
|
2021-05-26 18:07:09 +08:00 |
jiaoyangna
|
618d8094ea
|
无尽副本修改提交
|
2021-05-26 17:27:47 +08:00 |
zhangqiang
|
cf8fb5f147
|
【山河社稷图】bug
|
2021-05-26 17:24:58 +08:00 |
ZhangBiao
|
d799a102dc
|
【灵兽推送礼包】主城没入口
|
2021-05-26 17:10:55 +08:00 |
ZhangBiao
|
c9748421e9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 17:04:03 +08:00 |
ZhangBiao
|
e242e08b01
|
【名字颜色修改】
|
2021-05-26 17:03:42 +08:00 |
gaoxin
|
8c7a65bd5b
|
【挂机】修复文字残留的问题
|
2021-05-26 16:39:23 +08:00 |
wangzhenxing
|
5cb0cf109f
|
协议提交
|
2021-05-26 16:08:59 +08:00 |
wangzhenxing
|
b7eaf9a65a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 16:03:40 +08:00 |
wangzhenxing
|
d821836909
|
福利红包修改提交
|
2021-05-26 16:03:28 +08:00 |
zhangqiang
|
945ee5a968
|
【bug提交】
|
2021-05-26 15:47:29 +08:00 |
zhangqiang
|
9322a8489a
|
【提交】
|
2021-05-26 14:59:25 +08:00 |
jiaoyangna
|
bb2cd6a263
|
无尽副本修改提交
|
2021-05-26 14:57:28 +08:00 |
ZhangBiao
|
bc3c24c6b8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 14:44:49 +08:00 |
ZhangBiao
|
f186f29646
|
提交
|
2021-05-26 14:44:22 +08:00 |
gaoxin
|
c5c3672a65
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 14:16:58 +08:00 |
ZhangBiao
|
1e495ac6db
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 13:48:42 +08:00 |
ZhangBiao
|
b526f58bc3
|
【主界面】右上角调整
|
2021-05-26 13:48:33 +08:00 |
gaoxin
|
739ded2b11
|
【sdk】删除多余的字段
|
2021-05-26 13:44:39 +08:00 |
gaoxin
|
0583113fb8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 13:40:30 +08:00 |
gaoxin
|
4d934cc63c
|
【GM】位置移动
|
2021-05-26 13:40:08 +08:00 |
jiaoyangna
|
c95211428b
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-26 11:55:14 +08:00 |
ZhangBiao
|
51576888a2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 11:53:54 +08:00 |
ZhangBiao
|
5155b4aeb3
|
【主界面】提交
|
2021-05-26 11:53:45 +08:00 |
jiaoyangna
|
e3c4ac2440
|
无尽副本战力修改提交
|
2021-05-26 11:52:32 +08:00 |
zhangqiang
|
da9aeed441
|
【心魔试炼】提交
|
2021-05-26 11:48:44 +08:00 |
ZhangBiao
|
172f98c207
|
【修行】玩家界面预览报错修改
|
2021-05-26 11:28:59 +08:00 |
ZhangBiao
|
d7cda43ed0
|
【主界面】右上伸缩条调整
|
2021-05-26 11:16:27 +08:00 |
ZhangBiao
|
bd1417f9aa
|
【修行】引导包修改
|
2021-05-26 10:42:19 +08:00 |
jiaoyangna
|
06f4a3be80
|
无尽副本界面修改
|
2021-05-26 10:29:34 +08:00 |
ZhangBiao
|
a47268aa88
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 10:16:33 +08:00 |
ZhangBiao
|
f3cf294f42
|
【主界面】右上伸缩条首充引导调整,修行调整
|
2021-05-26 10:16:24 +08:00 |
zhangqiang
|
f8ddf0fbe6
|
【心魔试炼】提交
|
2021-05-26 10:00:30 +08:00 |
jiaoyangna
|
5ae6e53b49
|
士气等级提升图片提交
|
2021-05-26 09:59:28 +08:00 |
zhangqiang
|
281e19ad74
|
【心魔试炼】一键
|
2021-05-26 09:53:41 +08:00 |
jiaoyangna
|
911f443e40
|
添加属性提升
|
2021-05-26 09:51:41 +08:00 |
jiaoyangna
|
3846170f2d
|
属性提升界面修改提交
|
2021-05-25 21:40:41 +08:00 |
jiaoyangna
|
82787b2331
|
无尽编队修改
|
2021-05-25 21:27:38 +08:00 |
ZhangBiao
|
f38620058c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 21:09:43 +08:00 |
ZhangBiao
|
9e6dc29cb9
|
【主界面】右上伸缩条红点
|
2021-05-25 21:08:48 +08:00 |
zhangqiang
|
7353ddd09a
|
【心魔试炼】一键购买
|
2021-05-25 21:04:58 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
ZhangBiao
|
8d4d1aa777
|
【修行】第二短引导
|
2021-05-25 20:39:37 +08:00 |
jiaoyangna
|
da6dd0283c
|
编队修改提交
|
2021-05-25 20:37:12 +08:00 |
ZhangBiao
|
d835687e8c
|
【主城】伸缩条调整
|
2021-05-25 18:33:26 +08:00 |
ZhangBiao
|
d41ba9f65d
|
【主城】右侧伸缩条
|
2021-05-25 18:21:52 +08:00 |
jiaoyangna
|
a112127db0
|
无尽副本修改提交
|
2021-05-25 18:07:53 +08:00 |
jiaoyangna
|
5fb2aa23ce
|
无尽副本修改提交
|
2021-05-25 16:20:56 +08:00 |
ZhangBiao
|
d09ff174d2
|
【修行】取消玩家信息界面神印神将头像,练气期预览报错修改
|
2021-05-25 15:50:41 +08:00 |
ZhangBiao
|
1ab094facb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 15:00:07 +08:00 |
ZhangBiao
|
d00e5f99a7
|
【修行】神印界面调整
|
2021-05-25 14:59:59 +08:00 |
zhangqiang
|
1848a666e9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 14:53:41 +08:00 |
wangzhenxing
|
69d0f3ab39
|
公会福利红包修改提交
|
2021-05-25 14:52:02 +08:00 |
zhangqiang
|
dfa198081a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 14:51:58 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
ZhangBiao
|
42b6dd4d7a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:54:32 +08:00 |
ZhangBiao
|
41152acae9
|
【修行】排行榜界面,神将界面、神将替换提示调整
|
2021-05-25 11:54:19 +08:00 |
jiaoyangna
|
80691b1a9e
|
限购次数修改提交
(cherry picked from commit f7235b087b )
|
2021-05-25 11:33:52 +08:00 |
jiaoyangna
|
f7235b087b
|
限购次数修改提交
|
2021-05-25 11:22:30 +08:00 |
wangzhenxing
|
32b28f03eb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:15:04 +08:00 |
wangzhenxing
|
1e82024f29
|
添加弹窗类型
|
2021-05-25 11:14:50 +08:00 |
ZhangBiao
|
e3a45d34b5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:06:29 +08:00 |
ZhangBiao
|
1e2a932096
|
【修行预览、神将信息】
|
2021-05-25 11:06:20 +08:00 |
gaoxin
|
e7c8d5290d
|
【仙缘抽】修复报错
|
2021-05-25 10:30:18 +08:00 |
ZhangBiao
|
a22a984c61
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:16:17 +08:00 |
ZhangBiao
|
cecea9b415
|
【修行】主界面 修行提交 1
|
2021-05-25 10:16:07 +08:00 |
jiaoyangna
|
5f9b35a66c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:07:42 +08:00 |
jiaoyangna
|
c9c5480484
|
福星高照 提交
|
2021-05-25 10:07:31 +08:00 |
gaoxin
|
caa32bac70
|
【红包】消息删除空格
|
2021-05-25 10:00:42 +08:00 |
gaoxin
|
bfbc185604
|
【抽卡】仙缘汇聚箱加入山河社稷图星数条件
|
2021-05-24 20:33:26 +08:00 |
jiaoyangna
|
40fcabaf55
|
牛气冲天 提交
|
2021-05-24 20:26:53 +08:00 |
jiaoyangna
|
4452bb1d9a
|
音效提交
|
2021-05-24 20:22:38 +08:00 |
jiaoyangna
|
1d11aeb1b0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 19:50:38 +08:00 |
jiaoyangna
|
b36d04f7d7
|
牛气冲天 修改
|
2021-05-24 19:50:21 +08:00 |
gaoxin
|
23001be1b4
|
【战斗】跳过优化
|
2021-05-24 19:20:22 +08:00 |
wangzhenxing
|
31a58128c1
|
退出公会黑屏bug修改
|
2021-05-24 18:27:13 +08:00 |
gaoxin
|
563587e640
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 16:58:31 +08:00 |
gaoxin
|
24498b21a9
|
【公会】成员信息界面报错修复
|
2021-05-24 16:58:26 +08:00 |
ZhangBiao
|
6294f34149
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 16:38:41 +08:00 |
ZhangBiao
|
43a817235f
|
【修行】英雄选择附身中
|
2021-05-24 16:38:30 +08:00 |
gaoxin
|
e308fd0149
|
【主界面】修复update方法不能停止的问题
|
2021-05-24 16:24:16 +08:00 |
gaoxin
|
6d9f8f2f3d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 15:44:17 +08:00 |
gaoxin
|
d37728e374
|
【配置】修复公告兑换码不显示的问题
|
2021-05-24 15:44:10 +08:00 |
zhangqiang
|
41bf14a6ad
|
【山河社稷图】GM
|
2021-05-24 15:19:25 +08:00 |
jiaoyangna
|
6e90a19270
|
协议提交
|
2021-05-24 15:02:57 +08:00 |
jiaoyangna
|
34fd873ac4
|
修改提交
|
2021-05-24 15:00:38 +08:00 |
ZhangBiao
|
0332366e9d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 14:58:09 +08:00 |
ZhangBiao
|
6f27423920
|
【修行】提交
|
2021-05-24 14:58:00 +08:00 |
jiaoyangna
|
c68da98b84
|
Merge branch 'china/dev-c' into 0优化/无尽副本
|
2021-05-24 14:43:42 +08:00 |
gaoxin
|
4cc4bc87aa
|
【本地化】公告
|
2021-05-24 14:18:37 +08:00 |
gaoxin
|
4c02ba25cd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 14:16:52 +08:00 |
gaoxin
|
0f18eaf86c
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab
# Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
|
2021-05-24 14:15:30 +08:00 |
wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |
gaoxin
|
acc2609df6
|
【本地化】公告
|
2021-05-24 14:09:11 +08:00 |
ZhangBiao
|
fa051b65dc
|
【修行】QA增加
|
2021-05-24 13:58:30 +08:00 |
jiaoyangna
|
c22e26a5f5
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
|
2021-05-24 13:53:28 +08:00 |
ZhangBiao
|
04140ca1f2
|
【修行】神印按钮条件
|
2021-05-24 13:48:07 +08:00 |
ZhangBiao
|
d9b465c7cf
|
【修行】英雄选择界面修改
|
2021-05-24 12:02:20 +08:00 |
ZhangBiao
|
dade783281
|
【修行】英雄选择界面修改
|
2021-05-24 11:53:44 +08:00 |
jiaoyangna
|
a10ec722e5
|
无尽副本提交
|
2021-05-24 11:51:11 +08:00 |
ZhangBiao
|
040f83f370
|
【修行】红点调整
|
2021-05-24 11:34:50 +08:00 |
ZhangBiao
|
82a0370730
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 11:22:07 +08:00 |
ZhangBiao
|
70729ca2d0
|
【修行】增加红点
|
2021-05-24 11:21:56 +08:00 |
jiaoyangna
|
4ced80cf6a
|
福星高照,牛气冲天 提交
|
2021-05-24 11:08:16 +08:00 |
ZhangBiao
|
daf5a675f8
|
【修行】预览界面资源添加
|
2021-05-22 18:52:49 +08:00 |
ZhangBiao
|
b64e85bc2c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-22 18:20:14 +08:00 |
ZhangBiao
|
165ad7a2de
|
【修行】提交
|
2021-05-22 18:20:07 +08:00 |
zhangqiang
|
e404e26ffa
|
【山河社稷图】
|
2021-05-22 15:55:14 +08:00 |
zhangqiang
|
a30616a9fc
|
【山河社稷图】修改
|
2021-05-22 15:26:30 +08:00 |