gaoxin
|
8762e38ae8
|
【Version】
|
2021-08-09 10:34:31 +08:00 |
ZhangBiao
|
0520c4c685
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-09 10:01:11 +08:00 |
ZhangBiao
|
56d41630ce
|
【降妖夺宝】次数修改提交
|
2021-08-06 18:34:31 +08:00 |
jiaoyangna
|
cf9ddfaf96
|
图鉴提交
|
2021-08-06 17:46:24 +08:00 |
ZhangBiao
|
a87f58a31c
|
【天宫秘宝】礼包购买逻辑修复
|
2021-08-06 17:46:09 +08:00 |
jiaoyangna
|
97de80b9cd
|
图鉴提交
|
2021-08-06 17:19:44 +08:00 |
jiaoyangna
|
1adf97eddc
|
四元阵适配修改
|
2021-08-06 16:56:26 +08:00 |
jiaoyangna
|
e26a8a698c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-06 15:47:37 +08:00 |
jiaoyangna
|
34357fddff
|
滑动条修改提交
|
2021-08-06 15:47:31 +08:00 |
zhangqiang
|
43609ae65d
|
山河设计图觉醒图标修正
|
2021-08-06 14:42:34 +08:00 |
ZhangBiao
|
f40d297086
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-06 14:21:48 +08:00 |
ZhangBiao
|
87b7f4d7c8
|
【天宫秘宝】礼包购买逻辑修复
|
2021-08-06 14:21:27 +08:00 |
ZhangBiao
|
ab0dece261
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-06 11:32:10 +08:00 |
ZhangBiao
|
4dc9136405
|
【寻宝迷踪】提交
|
2021-08-06 11:31:41 +08:00 |
jiaoyangna
|
5cf3388a59
|
滑动 回弹修改提交
|
2021-08-06 11:29:06 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
ZhangBiao
|
4edc9a855b
|
【寻宝迷踪】提交
|
2021-08-05 17:23:25 +08:00 |
gaoxin
|
7024cc1f35
|
【公告】报错修改
|
2021-08-05 16:34:39 +08:00 |
gaoxin
|
360cbbf54f
|
【公告】报错修改
|
2021-08-05 16:34:05 +08:00 |
liujiaqi
|
1952492eba
|
【资源】玉珏碎片icon
|
2021-08-05 15:40:36 +08:00 |
jiaoyangna
|
5336505935
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-05 15:10:04 +08:00 |
jiaoyangna
|
ed3494e263
|
【ID1009947】
【优化】四元阵界面 新增界面特效
|
2021-08-05 15:09:58 +08:00 |
gaoxin
|
ac47f0c3a3
|
【打包工具】修改出包的包名,以及日志提交的内容
|
2021-08-05 14:45:44 +08:00 |
gaoxin
|
ee68d334af
|
【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置
|
2021-08-05 14:45:39 +08:00 |
gaoxin
|
67328caac1
|
【公告】公告显隐改为config文件配置
|
2021-08-05 14:45:34 +08:00 |
gaoxin
|
5f9bc0caae
|
【打包工具】修改出包的包名,以及日志提交的内容
|
2021-08-05 14:42:34 +08:00 |
gaoxin
|
597a747848
|
【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置
|
2021-08-05 14:41:19 +08:00 |
gaoxin
|
59afbd6773
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-05 14:39:44 +08:00 |
gaoxin
|
0f5e66cfea
|
【公告】公告显隐改为config文件配置
|
2021-08-05 14:39:39 +08:00 |
ZhangBiao
|
d86921d5a3
|
【降妖夺宝】次数修改提交
|
2021-08-05 14:33:07 +08:00 |
ZhangBiao
|
1c0880abbf
|
【寻宝迷踪】
|
2021-08-05 14:31:31 +08:00 |
gaoxin
|
6f63bec119
|
【子模块】测试
|
2021-08-05 11:46:27 +08:00 |
gaoxin
|
1734dc9132
|
添加Version文件夹子模块
|
2021-08-05 11:20:17 +08:00 |
gaoxin
|
c163d4d004
|
删除Version文件夹
|
2021-08-05 11:14:13 +08:00 |
gaoxin
|
e76b07646d
|
【打包工具】添加更新蓝鲸sdk的功能
|
2021-08-05 11:02:19 +08:00 |
gaoxin
|
e4416573b8
|
【打包工具】添加更新蓝鲸sdk的功能
|
2021-08-05 10:59:48 +08:00 |
zhangshanxue
|
804aa9963f
|
Merge branch 'china/test' of http://60.1.1.230/gaoxin/JL_Client into china/test
|
2021-08-04 22:17:36 +08:00 |
gaoxin
|
0a1a534403
|
【热更配置】跨服热更从test分支出
|
2021-08-04 22:16:40 +08:00 |
gaoxin
|
5dc039ab3a
|
【热更配置】跨服热更从test分支出
|
2021-08-04 22:14:59 +08:00 |
JieLing
|
4722ab29d6
|
Merge branch 'china/local' into china/test
|
2021-08-04 20:11:49 +08:00 |
ZhangBiao
|
b0ae4e3d2c
|
【万象商会】upview调整
|
2021-08-04 20:08:19 +08:00 |
gaoxin
|
a735668f30
|
【登录视频】修复登录视频黑屏
|
2021-08-04 20:08:04 +08:00 |
ZhangBiao
|
0a9315381e
|
【灵兽山】增加灵兽界面跳转
|
2021-08-04 19:47:35 +08:00 |
gaoxin
|
57ba11f9bb
|
【资源】我要变强背景资源回滚
|
2021-08-04 19:44:48 +08:00 |
ZhangBiao
|
9bd336158d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 18:47:09 +08:00 |
ZhangBiao
|
cad9409314
|
【万象商会】upview调整
|
2021-08-04 18:46:59 +08:00 |
ZhangBiao
|
87cf2102fe
|
【寻宝迷踪】添加资源
|
2021-08-04 18:16:36 +08:00 |
gaoxin
|
e46fa3636d
|
【登录视频】修复登录视频黑屏
|
2021-08-04 18:06:51 +08:00 |
zhangqiang
|
1e4b55d9fd
|
【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求
|
2021-08-04 17:53:30 +08:00 |
zhangqiang
|
3cf8a5d2ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 17:43:11 +08:00 |